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