--- dyld/dyld-1066.10/cache-builder/kernel_collection_builder.cpp
+++ dyld/dyld-960/cache-builder/kernel_collection_builder.cpp
@@ -77,12 +77,17 @@
     void error(const char* format, ...) {
         va_list list;
         va_start(list, format);
-        Diagnostics diag;
-        diag.error(format, list);
+        char* buffer = nullptr;
+        vasprintf(&buffer, format, list);
         va_end(list);
 
-        errorStorage.push_back(diag.errorMessage());
+        if ( buffer == nullptr )
+            return;
+
+        errorStorage.push_back(buffer);
         errors.push_back(errorStorage.back().data());
+
+        free(buffer);
     }
 
     void retain(CFTypeRef v) {
@@ -527,7 +532,7 @@
     builderOptions.archs = &dyld3::GradedArchs::forName(builder->arch);
     builderOptions.platform = dyld3::Platform::unknown;
     builderOptions.localSymbolMode = DyldSharedCache::LocalSymbolsMode::keep;
-    builderOptions.cacheConfiguration = kDyldSharedCacheTypeProduction;
+    builderOptions.optimizeStubs = true;
     builderOptions.optimizeDyldDlopens = false;
     builderOptions.optimizeDyldLaunches = false;
     builderOptions.codeSigningDigestMode = DyldSharedCache::CodeSigningDigestMode::SHA256only;