diff --git a/src/api.ts b/src/api.ts
index 90bb46e..5ae648e 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -138,9 +138,10 @@ const populateTweetProperties = async (
    available for free using api.fxtwitter.com. */
 export const statusAPI = async (
   status: string,
-  language: string | undefined
+  language: string | undefined,
+  event: FetchEvent
 ): Promise<APIResponse> => {
-  const conversation = await fetchUsingGuest(status);
+  const conversation = await fetchUsingGuest(status, event);
   const tweet = conversation?.globalObjects?.tweets?.[status] || {};
 
   /* Fallback for if Tweet did not load */
diff --git a/src/fetch.ts b/src/fetch.ts
index ef9f6c8..09786e9 100644
--- a/src/fetch.ts
+++ b/src/fetch.ts
@@ -1,6 +1,6 @@
 import { Constants } from './constants';
 
-export const fetchUsingGuest = async (status: string): Promise<TimelineBlobPartial> => {
+export const fetchUsingGuest = async (status: string, event: FetchEvent): Promise<TimelineBlobPartial> => {
   let apiAttempts = 0;
   let cachedTokenFailed = false;
 
@@ -121,9 +121,8 @@ export const fetchUsingGuest = async (status: string): Promise<TimelineBlobParti
       cachedTokenFailed = true;
       continue;
     }
-
     /* Once we've confirmed we have a working guest token, let's cache it! */
-    // event.waitUntil(cache.put(guestTokenRequest, activate.clone()));
+    event.waitUntil(cache.put(guestTokenRequest, activate.clone()));
     conversation.guestToken = guestToken;
     return conversation;
   }
diff --git a/src/server.ts b/src/server.ts
index 0472392..bfe00b4 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -90,7 +90,8 @@ const statusRequest = async (
       mediaNumber ? parseInt(mediaNumber) : undefined,
       userAgent,
       flags,
-      language
+      language,
+      event
     );
 
     /* Complete responses are normally sent just by errors. Normal embeds send a `text` value. */
diff --git a/src/status.ts b/src/status.ts
index d7b9e3d..439c781 100644
--- a/src/status.ts
+++ b/src/status.ts
@@ -24,12 +24,13 @@ export const handleStatus = async (
   mediaNumber?: number,
   userAgent?: string,
   flags?: InputFlags,
-  language?: string
+  language?: string,
+  event?: FetchEvent
   // eslint-disable-next-line sonarjs/cognitive-complexity
 ): Promise<StatusResponse> => {
   console.log('Direct?', flags?.direct);
 
-  const api = await statusAPI(status, language);
+  const api = await statusAPI(status, language, event as FetchEvent);
   const tweet = api?.tweet as APITweet;
 
   /* Catch this request if it's an API response */