Sync bootstrap code

Author: mlafeldt

src/bootstrap/handler.ts

@@ -23,7 +23,6 @@ import { RequestMetrics } from "./metrics.ts";
 import { Router } from "./router.ts";
 import type { Functions } from "./stage_2.ts";
 import { ErrorType, PassthroughError, UserError } from "./util/errors.ts";
-import { patchCaches } from "./util/patch_globals.ts";
 import "./globals/types.ts";
 
 interface HandleRequestOptions {
@@ -150,12 +149,6 @@ export const handleRequest = async (
     const cacheAPIToken = getCacheAPIToken(edgeReq);
     const cacheAPIURL = getCacheAPIURL(edgeReq);
 
-    // TODO: Once the Cache API has been fully rolled out, remove this call and
-    // let `patchGlobals` handle this.
-    if (cacheAPIToken && cacheAPIURL) {
-      patchCaches();
-    }
-
     let functionNames = functionNamesHeader.split(",");
 
     // We don't want to run the same function multiple times in the same chain,

src/bootstrap/util/patch_globals.ts

@@ -68,17 +68,11 @@ export const patchGlobals = () => {
 
   globalThis.fetch = patchFetchToForwardHeaders(globalThis.fetch);
   globalThis.fetch = patchFetchToTrackSubrequests(globalThis.fetch);
-};
 
-let hasPatchedCaches = false;
+  patchCaches();
+};
 
 export const patchCaches = () => {
-  if (hasPatchedCaches) {
-    return;
-  }
-
-  hasPatchedCaches = true;
-
   if (globalThis.caches) {
     // @ts-expect-error This is the only way to set `globalThis.caches`, even
     // though it's against the type definition.