diff --git a/extended-request.ts b/extended-request.ts
index cd23f20..37a4091 100644
--- a/extended-request.ts
+++ b/extended-request.ts
@@ -117,9 +117,10 @@ export default class ExtendedRequest {
 
     async cacheOrigin(): Promise<void> {
         let url: string;
-        if (this.data.tabId && this.data.tabId >= 0) {
-            const tab = await browser.tabs.get(this.data.tabId);
-            url = tab.url;
+        if (this.data.type === 'main_frame') {
+            url = this.data.url;
+        } else if (this.data.originUrl) {
+            url = this.data.originUrl;
         } else if (
             (this.data as any)?.frameAncestors &&
             (this.data as any).frameAncestors[0] !== undefined