@graphql-box/cache-manager 3.2.0 → 3.3.0

package/lib/browser/production.analysis.txt

@@ -1,50 +1,50 @@
 -----------------------------
 Rollup File Analysis
 -----------------------------
-bundle size:    91.643 KB
-original size:  62.603 KB
+bundle size:    94.892 KB
+original size:  63.186 KB
 code reduction: 0 %
 module count:   24
 
 ███████████████████████████████████░░░░░░░░░░░░░░░
 file:            /src/main/index.ts
-bundle space:    71.96 %
-rendered size:   65.946 KB
-original size:   38.051 KB
+bundle space:    70.23 %
+rendered size:   66.645 KB
+original size:   38.491 KB
 code reduction:  0 %
 dependents:      1
   - /src/index.ts
 
 ██░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-query/index.ts
-bundle space:    4.19 %
-rendered size:   3.839 KB
-original size:   1.282 KB
+bundle space:    5.41 %
+rendered size:   5.135 KB
+original size:   1.492 KB
 code reduction:  0 %
 dependents:      1
   - /src/debug/index.ts
 
-█░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+██░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-entry/index.ts
-bundle space:    3.77 %
-rendered size:   3.451 KB
-original size:   1.197 KB
+bundle space:    4.99 %
+rendered size:   4.737 KB
+original size:   1.397 KB
 code reduction:  0 %
 dependents:      1
   - /src/debug/index.ts
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-partial-compiled/index.ts
-bundle space:    3.68 %
-rendered size:   3.37 KB
-original size:   1.161 KB
+bundle space:    3.66 %
+rendered size:   3.475 KB
+original size:   1.162 KB
 code reduction:  0 %
 dependents:      1
   - /src/debug/index.ts
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterField.ts
-bundle space:    3.09 %
+bundle space:    2.99 %
 rendered size:   2.834 KB
 original size:   2.94 KB
 code reduction:  3.61 %
@@ -54,8 +54,8 @@ dependents:      2
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/mergeResponseDataSets.ts
-bundle space:    1.87 %
-rendered size:   1.716 KB
+bundle space:    1.82 %
+rendered size:   1.728 KB
 original size:   907 Bytes
 code reduction:  0 %
 dependents:      1
@@ -63,7 +63,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentDefinitions.ts
-bundle space:    1.6 %
+bundle space:    1.54 %
 rendered size:   1.462 KB
 original size:   1.517 KB
 code reduction:  3.63 %
@@ -72,7 +72,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/normalizePatchResponseData.ts
-bundle space:    1.43 %
+bundle space:    1.38 %
 rendered size:   1.309 KB
 original size:   478 Bytes
 code reduction:  0 %
@@ -81,7 +81,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterQuery.ts
-bundle space:    1.22 %
+bundle space:    1.18 %
 rendered size:   1.117 KB
 original size:   1.49 KB
 code reduction:  25.03 %
@@ -90,7 +90,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterIDsAndTypeNames.ts
-bundle space:    1.09 %
+bundle space:    1.05 %
 rendered size:   998 Bytes
 original size:   1.165 KB
 code reduction:  14.33 %
@@ -99,7 +99,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/checkFieldPathChecklist.ts
-bundle space:    1.04 %
+bundle space:    1.01 %
 rendered size:   957 Bytes
 original size:   828 Bytes
 code reduction:  0 %
@@ -108,7 +108,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterOutPropsWithArgsOrDirectives.ts
-bundle space:    1.01 %
+bundle space:    0.98 %
 rendered size:   927 Bytes
 original size:   1.081 KB
 code reduction:  14.25 %
@@ -117,7 +117,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterInlineFragments.ts
-bundle space:    0.86 %
+bundle space:    0.83 %
 rendered size:   788 Bytes
 original size:   999 Bytes
 code reduction:  21.12 %
@@ -126,7 +126,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/deriveOpCacheability.ts
-bundle space:    0.86 %
+bundle space:    0.83 %
 rendered size:   786 Bytes
 original size:   858 Bytes
 code reduction:  8.39 %
@@ -135,7 +135,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentSpreads.ts
-bundle space:    0.67 %
+bundle space:    0.65 %
 rendered size:   616 Bytes
 original size:   942 Bytes
 code reduction:  34.61 %
@@ -144,36 +144,32 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/createFragmentSpreadChecklist.ts
-bundle space:    0.5 %
+bundle space:    0.48 %
 rendered size:   457 Bytes
 original size:   572 Bytes
 code reduction:  20.1 %
 dependents:      1
   - /src/helpers/filterQuery.ts
 
-░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-file:            /src/consts/index.ts
-bundle space:    0.34 %
-rendered size:   315 Bytes
-original size:   390 Bytes
-code reduction:  19.23 %
-dependents:      6
-  - /src/debug/log-cache-entry/index.ts
-  - /src/debug/log-cache-query/index.ts
-  - /src/debug/log-partial-compiled/index.ts
-  - /src/helpers/deriveOpCacheability.ts
-  - /src/main/index.ts
-  - /src/index.ts
-
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/validTypeIDValue.ts
-bundle space:    0.34 %
+bundle space:    0.33 %
 rendered size:   309 Bytes
 original size:   426 Bytes
 code reduction:  27.46 %
 dependents:      1
   - /src/main/index.ts
 
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+file:            /src/consts/index.ts
+bundle space:    0.17 %
+rendered size:   166 Bytes
+original size:   213 Bytes
+code reduction:  22.07 %
+dependents:      2
+  - /src/helpers/deriveOpCacheability.ts
+  - /src/main/index.ts
+
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/isNotResponseChunk.ts
 bundle space:    0.17 %
@@ -185,7 +181,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/isLastResponseChunk.ts
-bundle space:    0.17 %
+bundle space:    0.16 %
 rendered size:   156 Bytes
 original size:   304 Bytes
 code reduction:  48.68 %
@@ -194,7 +190,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/isNotLastResponseChunk.ts
-bundle space:    0.15 %
+bundle space:    0.14 %
 rendered size:   133 Bytes
 original size:   278 Bytes
 code reduction:  52.16 %
@@ -223,7 +219,7 @@ dependents:      1
 file:            /src/index.ts
 bundle space:    0 %
 rendered size:   0 Byte
-original size:   163 Bytes
+original size:   72 Bytes
 code reduction:  100 %
 dependents:      0
 

package/lib/main/consts/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PARTIAL_QUERY_COMPILED = exports.CACHE_ENTRY_QUERIED = exports.CACHE_ENTRY_ADDED = exports.HEADER_NO_CACHE = exports.HEADER_CACHE_CONTROL = exports.NO_CACHE = exports.CACHE_CONTROL = exports.METADATA = void 0;
+exports.HEADER_NO_CACHE = exports.HEADER_CACHE_CONTROL = exports.NO_CACHE = exports.CACHE_CONTROL = exports.METADATA = void 0;
 const METADATA = "metadata";
 exports.METADATA = METADATA;
 const CACHE_CONTROL = "cacheControl";
@@ -14,10 +14,4 @@ const HEADER_CACHE_CONTROL = "cache-control";
 exports.HEADER_CACHE_CONTROL = HEADER_CACHE_CONTROL;
 const HEADER_NO_CACHE = "no-cache";
 exports.HEADER_NO_CACHE = HEADER_NO_CACHE;
-const CACHE_ENTRY_ADDED = "cache_entry_added";
-exports.CACHE_ENTRY_ADDED = CACHE_ENTRY_ADDED;
-const CACHE_ENTRY_QUERIED = "cache_entry_queried";
-exports.CACHE_ENTRY_QUERIED = CACHE_ENTRY_QUERIED;
-const PARTIAL_QUERY_COMPILED = "partial_query_compiled";
-exports.PARTIAL_QUERY_COMPILED = PARTIAL_QUERY_COMPILED;
 //# sourceMappingURL=index.js.map

package/lib/main/consts/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/consts/index.ts"],"names":["METADATA","CACHE_CONTROL","NO_CACHE","HEADER_CACHE_CONTROL","HEADER_NO_CACHE","CACHE_ENTRY_ADDED","CACHE_ENTRY_QUERIED","PARTIAL_QUERY_COMPILED"],"mappings":";;;;;;AAAO,MAAMA,QAAQ,GAAG,UAAjB;;AACA,MAAMC,aAAa,GAAG,cAAtB;;AACA,MAAMC,QAAQ,GAAG,SAAjB;;AAEA,MAAMC,oBAAoB,GAAG,eAA7B;;AACA,MAAMC,eAAe,GAAG,UAAxB;;AAEA,MAAMC,iBAAiB,GAAG,mBAA1B;;AACA,MAAMC,mBAAmB,GAAG,qBAA5B;;AACA,MAAMC,sBAAsB,GAAG,wBAA/B","sourcesContent":["export const METADATA = \"metadata\";\nexport const CACHE_CONTROL = \"cacheControl\";\nexport const NO_CACHE = \"noCache\";\n\nexport const HEADER_CACHE_CONTROL = \"cache-control\";\nexport const HEADER_NO_CACHE = \"no-cache\";\n\nexport const CACHE_ENTRY_ADDED = \"cache_entry_added\";\nexport const CACHE_ENTRY_QUERIED = \"cache_entry_queried\";\nexport const PARTIAL_QUERY_COMPILED = \"partial_query_compiled\";\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/consts/index.ts"],"names":["METADATA","CACHE_CONTROL","NO_CACHE","HEADER_CACHE_CONTROL","HEADER_NO_CACHE"],"mappings":";;;;;;AAAO,MAAMA,QAAQ,GAAG,UAAjB;;AACA,MAAMC,aAAa,GAAG,cAAtB;;AACA,MAAMC,QAAQ,GAAG,SAAjB;;AAEA,MAAMC,oBAAoB,GAAG,eAA7B;;AACA,MAAMC,eAAe,GAAG,UAAxB","sourcesContent":["export const METADATA = \"metadata\";\nexport const CACHE_CONTROL = \"cacheControl\";\nexport const NO_CACHE = \"noCache\";\n\nexport const HEADER_CACHE_CONTROL = \"cache-control\";\nexport const HEADER_NO_CACHE = \"no-cache\";\n"],"file":"index.js"}

package/lib/main/debug/log-cache-entry/index.js

@@ -7,7 +7,7 @@ exports.default = logCacheEntry;
 
 require("core-js/modules/es.promise.js");
 
-var _consts = require("../../consts");
+var _core = require("@graphql-box/core");
 
 function logCacheEntry() {
   return (_target, _propertyName, descriptor) => {
@@ -18,6 +18,8 @@ function logCacheEntry() {
       return new Promise(async resolve => {
         const {
           debugManager,
+          requestFieldCacheKey,
+          requestID,
           ...otherContext
         } = args[5];
 
@@ -32,19 +34,24 @@ function logCacheEntry() {
         const endTime = debugManager.now();
         const duration = endTime - startTime;
         resolve();
-        debugManager.emit(_consts.CACHE_ENTRY_ADDED, {
+        const payload = {
           cachemapOptions: args[3],
           cacheType: args[0],
           context: otherContext,
           hash: args[1],
           options: args[4],
+          requestID,
           stats: {
             duration,
             endTime,
             startTime
           },
-          value: args[2]
-        });
+          value: args[2],
+          ...(requestFieldCacheKey ? {
+            decryptedCacheKey: requestFieldCacheKey
+          } : {})
+        };
+        debugManager.emit(_core.CACHE_ENTRY_ADDED, payload);
       });
     };
   };

package/lib/main/debug/log-cache-entry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/debug/log-cache-entry/index.ts"],"names":["logCacheEntry","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","otherContext","apply","startTime","now","endTime","duration","emit","CACHE_ENTRY_ADDED","cachemapOptions","cacheType","context","hash","options","stats"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgB,aAAGC;AAAnB,YAAoCJ,IAAI,CAAC,CAAD,CAA9C;;AAEA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMI,SAAS,GAAGH,YAAY,CAACI,GAAb,EAAlB;AACA,cAAMV,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACA,cAAMQ,OAAO,GAAGL,YAAY,CAACI,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAJ,QAAAA,OAAO;AAEPC,QAAAA,YAAY,CAACO,IAAb,CAAkBC,yBAAlB,EAAqC;AACnCC,UAAAA,eAAe,EAAEZ,IAAI,CAAC,CAAD,CADc;AAEnCa,UAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CAFoB;AAGnCc,UAAAA,OAAO,EAAEV,YAH0B;AAInCW,UAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAJyB;AAKnCgB,UAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CALsB;AAMnCiB,UAAAA,KAAK,EAAE;AAAER,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB,WAN4B;AAOnCR,UAAAA,KAAK,EAAEE,IAAI,CAAC,CAAD;AAPwB,SAArC;AASD,OAxBM,CAAP;AAyBD,KA1BD;AA2BD,GAnCD;AAoCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_ADDED } from \"../../consts\";\n\nexport default function logCacheEntry() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, ...otherContext } = args[5] as RequestContext;\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        debugManager.emit(CACHE_ENTRY_ADDED, {\n          cachemapOptions: args[3],\n          cacheType: args[0],\n          context: otherContext,\n          hash: args[1],\n          options: args[4],\n          stats: { duration, endTime, startTime },\n          value: args[2],\n        });\n      });\n    };\n  };\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../../src/debug/log-cache-entry/index.ts"],"names":["logCacheEntry","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","requestFieldCacheKey","requestID","otherContext","apply","startTime","now","endTime","duration","payload","cachemapOptions","cacheType","context","hash","options","stats","decryptedCacheKey","emit","CACHE_ENTRY_ADDED"],"mappings":";;;;;;;;;AAAA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgBC,UAAAA,oBAAhB;AAAsCC,UAAAA,SAAtC;AAAiD,aAAGC;AAApD,YAAqEN,IAAI,CAAC,CAAD,CAA/E;;AAIA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACU,KAAP,CAAa,IAAb,EAAmBP,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMM,SAAS,GAAGL,YAAY,CAACM,GAAb,EAAlB;AACA,cAAMZ,MAAM,CAACU,KAAP,CAAa,IAAb,EAAmBP,IAAnB,CAAN;AACA,cAAMU,OAAO,GAAGP,YAAY,CAACM,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAN,QAAAA,OAAO;AAEP,cAAMU,OAAO,GAAG;AACdC,UAAAA,eAAe,EAAEb,IAAI,CAAC,CAAD,CADP;AAEdc,UAAAA,SAAS,EAAEd,IAAI,CAAC,CAAD,CAFD;AAGde,UAAAA,OAAO,EAAET,YAHK;AAIdU,UAAAA,IAAI,EAAEhB,IAAI,CAAC,CAAD,CAJI;AAKdiB,UAAAA,OAAO,EAAEjB,IAAI,CAAC,CAAD,CALC;AAMdK,UAAAA,SANc;AAOda,UAAAA,KAAK,EAAE;AAAEP,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB,WAPO;AAQdV,UAAAA,KAAK,EAAEE,IAAI,CAAC,CAAD,CARG;AASd,cAAII,oBAAoB,GAAG;AAAEe,YAAAA,iBAAiB,EAAEf;AAArB,WAAH,GAAiD,EAAzE;AATc,SAAhB;AAYAD,QAAAA,YAAY,CAACiB,IAAb,CAAkBC,uBAAlB,EAAqCT,OAArC;AACD,OA9BM,CAAP;AA+BD,KAhCD;AAiCD,GAzCD;AA0CD","sourcesContent":["import { CACHE_ENTRY_ADDED, RequestContext } from \"@graphql-box/core\";\n\nexport default function logCacheEntry() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, requestFieldCacheKey, requestID, ...otherContext } = args[5] as RequestContext & {\n          requestFieldCacheKey?: string;\n        };\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        const payload = {\n          cachemapOptions: args[3],\n          cacheType: args[0],\n          context: otherContext,\n          hash: args[1],\n          options: args[4],\n          requestID,\n          stats: { duration, endTime, startTime },\n          value: args[2],\n          ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),\n        };\n\n        debugManager.emit(CACHE_ENTRY_ADDED, payload);\n      });\n    };\n  };\n}\n"],"file":"index.js"}

package/lib/main/debug/log-cache-query/index.js

@@ -7,7 +7,7 @@ exports.default = logCacheQuery;
 
 require("core-js/modules/es.promise.js");
 
-var _consts = require("../../consts");
+var _core = require("@graphql-box/core");
 
 function logCacheQuery() {
   return (_target, _propertyName, descriptor) => {
@@ -19,6 +19,8 @@ function logCacheQuery() {
         return new Promise(async resolve => {
           const {
             debugManager,
+            requestFieldCacheKey,
+            requestID,
             ...otherContext
           } = args[3];
 
@@ -32,18 +34,23 @@ function logCacheQuery() {
           const endTime = debugManager.now();
           const duration = endTime - startTime;
           resolve(result);
-          debugManager.emit(_consts.CACHE_ENTRY_QUERIED, {
+          const payload = {
             cacheType: args[0],
             context: otherContext,
             hash: args[1],
             options: args[2],
+            requestID,
             result,
             stats: {
               duration,
               endTime,
               startTime
-            }
-          });
+            },
+            ...(requestFieldCacheKey ? {
+              decryptedCacheKey: requestFieldCacheKey
+            } : {})
+          };
+          debugManager.emit(_core.CACHE_ENTRY_QUERIED, payload);
         });
       } catch (error) {
         return Promise.reject(error);

package/lib/main/debug/log-cache-query/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/debug/log-cache-query/index.ts"],"names":["logCacheQuery","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","otherContext","apply","startTime","now","result","endTime","duration","emit","CACHE_ENTRY_QUERIED","cacheType","context","hash","options","stats","error","reject"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,UAAI;AACF,eAAO,IAAIC,OAAJ,CAAY,MAAMC,OAAN,IAAiB;AAClC,gBAAM;AAAEC,YAAAA,YAAF;AAAgB,eAAGC;AAAnB,cAAoCJ,IAAI,CAAC,CAAD,CAA9C;;AAEA,cAAI,CAACG,YAAL,EAAmB;AACjBD,YAAAA,OAAO,CAAC,MAAML,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAP,CAAP;AACA;AACD;;AAED,gBAAMM,SAAS,GAAGH,YAAY,CAACI,GAAb,EAAlB;AACA,gBAAMC,MAAM,GAAG,MAAMX,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAArB;AACA,gBAAMS,OAAO,GAAGN,YAAY,CAACI,GAAb,EAAhB;AACA,gBAAMG,QAAQ,GAAGD,OAAO,GAAGH,SAA3B;AACAJ,UAAAA,OAAO,CAACM,MAAD,CAAP;AAEAL,UAAAA,YAAY,CAACQ,IAAb,CAAkBC,2BAAlB,EAAuC;AACrCC,YAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CADsB;AAErCc,YAAAA,OAAO,EAAEV,YAF4B;AAGrCW,YAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAH2B;AAIrCgB,YAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CAJwB;AAKrCQ,YAAAA,MALqC;AAMrCS,YAAAA,KAAK,EAAE;AAAEP,cAAAA,QAAF;AAAYD,cAAAA,OAAZ;AAAqBH,cAAAA;AAArB;AAN8B,WAAvC;AAQD,SAtBM,CAAP;AAuBD,OAxBD,CAwBE,OAAOY,KAAP,EAAc;AACd,eAAOjB,OAAO,CAACkB,MAAR,CAAeD,KAAf,CAAP;AACD;AACF,KA5BD;AA6BD,GArCD;AAsCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_QUERIED } from \"../../consts\";\n\nexport default function logCacheQuery() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      try {\n        return new Promise(async resolve => {\n          const { debugManager, ...otherContext } = args[3] as RequestContext;\n\n          if (!debugManager) {\n            resolve(await method.apply(this, args));\n            return;\n          }\n\n          const startTime = debugManager.now();\n          const result = await method.apply(this, args);\n          const endTime = debugManager.now();\n          const duration = endTime - startTime;\n          resolve(result);\n\n          debugManager.emit(CACHE_ENTRY_QUERIED, {\n            cacheType: args[0],\n            context: otherContext,\n            hash: args[1],\n            options: args[2],\n            result,\n            stats: { duration, endTime, startTime },\n          });\n        });\n      } catch (error) {\n        return Promise.reject(error);\n      }\n    };\n  };\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../../src/debug/log-cache-query/index.ts"],"names":["logCacheQuery","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","requestFieldCacheKey","requestID","otherContext","apply","startTime","now","result","endTime","duration","payload","cacheType","context","hash","options","stats","decryptedCacheKey","emit","CACHE_ENTRY_QUERIED","error","reject"],"mappings":";;;;;;;;;AAAA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,UAAI;AACF,eAAO,IAAIC,OAAJ,CAAY,MAAMC,OAAN,IAAiB;AAClC,gBAAM;AAAEC,YAAAA,YAAF;AAAgBC,YAAAA,oBAAhB;AAAsCC,YAAAA,SAAtC;AAAiD,eAAGC;AAApD,cAAqEN,IAAI,CAAC,CAAD,CAA/E;;AAIA,cAAI,CAACG,YAAL,EAAmB;AACjBD,YAAAA,OAAO,CAAC,MAAML,MAAM,CAACU,KAAP,CAAa,IAAb,EAAmBP,IAAnB,CAAP,CAAP;AACA;AACD;;AAED,gBAAMQ,SAAS,GAAGL,YAAY,CAACM,GAAb,EAAlB;AACA,gBAAMC,MAAM,GAAG,MAAMb,MAAM,CAACU,KAAP,CAAa,IAAb,EAAmBP,IAAnB,CAArB;AACA,gBAAMW,OAAO,GAAGR,YAAY,CAACM,GAAb,EAAhB;AACA,gBAAMG,QAAQ,GAAGD,OAAO,GAAGH,SAA3B;AACAN,UAAAA,OAAO,CAACQ,MAAD,CAAP;AAEA,gBAAMG,OAAO,GAAG;AACdC,YAAAA,SAAS,EAAEd,IAAI,CAAC,CAAD,CADD;AAEde,YAAAA,OAAO,EAAET,YAFK;AAGdU,YAAAA,IAAI,EAAEhB,IAAI,CAAC,CAAD,CAHI;AAIdiB,YAAAA,OAAO,EAAEjB,IAAI,CAAC,CAAD,CAJC;AAKdK,YAAAA,SALc;AAMdK,YAAAA,MANc;AAOdQ,YAAAA,KAAK,EAAE;AAAEN,cAAAA,QAAF;AAAYD,cAAAA,OAAZ;AAAqBH,cAAAA;AAArB,aAPO;AAQd,gBAAIJ,oBAAoB,GAAG;AAAEe,cAAAA,iBAAiB,EAAEf;AAArB,aAAH,GAAiD,EAAzE;AARc,WAAhB;AAWAD,UAAAA,YAAY,CAACiB,IAAb,CAAkBC,yBAAlB,EAAuCR,OAAvC;AACD,SA5BM,CAAP;AA6BD,OA9BD,CA8BE,OAAOS,KAAP,EAAc;AACd,eAAOrB,OAAO,CAACsB,MAAR,CAAeD,KAAf,CAAP;AACD;AACF,KAlCD;AAmCD,GA3CD;AA4CD","sourcesContent":["import { CACHE_ENTRY_QUERIED, RequestContext } from \"@graphql-box/core\";\n\nexport default function logCacheQuery() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      try {\n        return new Promise(async resolve => {\n          const { debugManager, requestFieldCacheKey, requestID, ...otherContext } = args[3] as RequestContext & {\n            requestFieldCacheKey?: string;\n          };\n\n          if (!debugManager) {\n            resolve(await method.apply(this, args));\n            return;\n          }\n\n          const startTime = debugManager.now();\n          const result = await method.apply(this, args);\n          const endTime = debugManager.now();\n          const duration = endTime - startTime;\n          resolve(result);\n\n          const payload = {\n            cacheType: args[0],\n            context: otherContext,\n            hash: args[1],\n            options: args[2],\n            requestID,\n            result,\n            stats: { duration, endTime, startTime },\n            ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),\n          };\n\n          debugManager.emit(CACHE_ENTRY_QUERIED, payload);\n        });\n      } catch (error) {\n        return Promise.reject(error);\n      }\n    };\n  };\n}\n"],"file":"index.js"}

package/lib/main/debug/log-partial-compiled/index.js

@@ -7,7 +7,7 @@ exports.default = logPartialCompiled;
 
 require("core-js/modules/es.promise.js");
 
-var _consts = require("../../consts");
+var _core = require("@graphql-box/core");
 
 function logPartialCompiled() {
   return (_target, _propertyName, descriptor) => {
@@ -18,6 +18,7 @@ function logPartialCompiled() {
       return new Promise(async resolve => {
         const {
           debugManager,
+          requestID,
           ...otherContext
         } = args[3];
 
@@ -32,11 +33,12 @@ function logPartialCompiled() {
         const endTime = debugManager.now();
         const duration = endTime - startTime;
         resolve();
-        debugManager.emit(_consts.PARTIAL_QUERY_COMPILED, {
+        debugManager.emit(_core.PARTIAL_QUERY_COMPILED, {
           context: otherContext,
           hash: args[0],
           options: args[2],
           partialQueryResponse: args[1],
+          requestID,
           stats: {
             duration,
             endTime,

package/lib/main/debug/log-partial-compiled/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/debug/log-partial-compiled/index.ts"],"names":["logPartialCompiled","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","otherContext","apply","startTime","now","endTime","duration","emit","PARTIAL_QUERY_COMPILED","context","hash","options","partialQueryResponse","stats"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,kBAAT,GAA8B;AAC3C,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgB,aAAGC;AAAnB,YAAoCJ,IAAI,CAAC,CAAD,CAA9C;;AAEA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMI,SAAS,GAAGH,YAAY,CAACI,GAAb,EAAlB;AACA,cAAMV,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACA,cAAMQ,OAAO,GAAGL,YAAY,CAACI,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAJ,QAAAA,OAAO;AAEPC,QAAAA,YAAY,CAACO,IAAb,CAAkBC,8BAAlB,EAA0C;AACxCC,UAAAA,OAAO,EAAER,YAD+B;AAExCS,UAAAA,IAAI,EAAEb,IAAI,CAAC,CAAD,CAF8B;AAGxCc,UAAAA,OAAO,EAAEd,IAAI,CAAC,CAAD,CAH2B;AAIxCe,UAAAA,oBAAoB,EAAEf,IAAI,CAAC,CAAD,CAJc;AAKxCgB,UAAAA,KAAK,EAAE;AAAEP,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB;AALiC,SAA1C;AAOD,OAtBM,CAAP;AAuBD,KAxBD;AAyBD,GAjCD;AAkCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { PARTIAL_QUERY_COMPILED } from \"../../consts\";\n\nexport default function logPartialCompiled() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, ...otherContext } = args[3] as RequestContext;\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        debugManager.emit(PARTIAL_QUERY_COMPILED, {\n          context: otherContext,\n          hash: args[0],\n          options: args[2],\n          partialQueryResponse: args[1],\n          stats: { duration, endTime, startTime },\n        });\n      });\n    };\n  };\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../../src/debug/log-partial-compiled/index.ts"],"names":["logPartialCompiled","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","requestID","otherContext","apply","startTime","now","endTime","duration","emit","PARTIAL_QUERY_COMPILED","context","hash","options","partialQueryResponse","stats"],"mappings":";;;;;;;;;AAAA;;AAEe,SAASA,kBAAT,GAA8B;AAC3C,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgBC,UAAAA,SAAhB;AAA2B,aAAGC;AAA9B,YAA+CL,IAAI,CAAC,CAAD,CAAzD;;AAEA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMK,SAAS,GAAGJ,YAAY,CAACK,GAAb,EAAlB;AACA,cAAMX,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAAN;AACA,cAAMS,OAAO,GAAGN,YAAY,CAACK,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAL,QAAAA,OAAO;AAEPC,QAAAA,YAAY,CAACQ,IAAb,CAAkBC,4BAAlB,EAA0C;AACxCC,UAAAA,OAAO,EAAER,YAD+B;AAExCS,UAAAA,IAAI,EAAEd,IAAI,CAAC,CAAD,CAF8B;AAGxCe,UAAAA,OAAO,EAAEf,IAAI,CAAC,CAAD,CAH2B;AAIxCgB,UAAAA,oBAAoB,EAAEhB,IAAI,CAAC,CAAD,CAJc;AAKxCI,UAAAA,SALwC;AAMxCa,UAAAA,KAAK,EAAE;AAAEP,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB;AANiC,SAA1C;AAQD,OAvBM,CAAP;AAwBD,KAzBD;AA0BD,GAlCD;AAmCD","sourcesContent":["import { PARTIAL_QUERY_COMPILED, RequestContext } from \"@graphql-box/core\";\n\nexport default function logPartialCompiled() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, requestID, ...otherContext } = args[3] as RequestContext;\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        debugManager.emit(PARTIAL_QUERY_COMPILED, {\n          context: otherContext,\n          hash: args[0],\n          options: args[2],\n          partialQueryResponse: args[1],\n          requestID,\n          stats: { duration, endTime, startTime },\n        });\n      });\n    };\n  };\n}\n"],"file":"index.js"}

package/lib/main/index.js

@@ -4,29 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  CACHE_ENTRY_ADDED: true,
-  CACHE_ENTRY_QUERIED: true,
-  PARTIAL_QUERY_COMPILED: true,
   CacheManager: true
 };
-Object.defineProperty(exports, "CACHE_ENTRY_ADDED", {
-  enumerable: true,
-  get: function () {
-    return _consts.CACHE_ENTRY_ADDED;
-  }
-});
-Object.defineProperty(exports, "CACHE_ENTRY_QUERIED", {
-  enumerable: true,
-  get: function () {
-    return _consts.CACHE_ENTRY_QUERIED;
-  }
-});
-Object.defineProperty(exports, "PARTIAL_QUERY_COMPILED", {
-  enumerable: true,
-  get: function () {
-    return _consts.PARTIAL_QUERY_COMPILED;
-  }
-});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
@@ -40,8 +19,6 @@ Object.defineProperty(exports, "CacheManager", {
   }
 });
 
-var _consts = require("./consts");
-
 var _defs = require("./defs");
 
 Object.keys(_defs).forEach(function (key) {

package/lib/main/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA","sourcesContent":["export { CACHE_ENTRY_ADDED, CACHE_ENTRY_QUERIED, PARTIAL_QUERY_COMPILED } from \"./consts\";\nexport * from \"./defs\";\nexport { default, CacheManager } from \"./main\";\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA","sourcesContent":["export * from \"./defs\";\nexport { default, CacheManager } from \"./main\";\n"],"file":"index.js"}

package/lib/main/main/index.js

@@ -368,6 +368,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     const {
       hashedRequestFieldCacheKey,
       propNameOrIndex,
+      requestFieldCacheKey,
       requestFieldPath
     } = keysAndPaths;
     const fieldTypeInfo = context.fieldTypeMap.get(requestFieldPath);
@@ -389,7 +390,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
       const {
         cacheability,
         entry
-      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, options, context);
+      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, requestFieldCacheKey, options, context);
 
       CacheManager._setCachedResponseData({
         cacheability,
@@ -742,7 +743,8 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     requestFieldPathData: ancestorRequestFieldPathData
   }, {
     hashedRequestFieldCacheKey,
-    propNameOrIndex
+    propNameOrIndex,
+    requestFieldCacheKey
   }, fieldTypeInfo, options, context) {
     var _entityData;
 
@@ -756,7 +758,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
       const {
         cacheability: entryCacheability,
         entry
-      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, options, context);
+      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, requestFieldCacheKey, options, context);
 
       if (entry) {
         requestFieldPathData = this._mergeObjects(requestFieldPathData, entry);
@@ -795,8 +797,10 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     };
   }
 
-  async _retrieveCachedRequestFieldPathData(hash, options, context) {
-    return this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hash, options, context) || {};
+  async _retrieveCachedRequestFieldPathData(hash, requestFieldCacheKey, options, context) {
+    return this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hash, options, { ...context,
+      requestFieldCacheKey
+    }) || {};
   }
 
   async _retrieveCachedResponseData({
@@ -828,9 +832,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
   }
 
   _retrieveResponseDataForCaching(normalizedResponseData, context) {
-    const responseChunks = this._responseChunksAwaitingCaching.get(context.boxID);
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.requestID);
 
-    this._responseChunksAwaitingCaching.delete(context.boxID);
+    this._responseChunksAwaitingCaching.delete(context.requestID);
 
     return (0, _mergeResponseDataSets.default)([...responseChunks, normalizedResponseData]);
   }
@@ -1018,6 +1022,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
   }, options, context) {
     const {
       hashedRequestFieldCacheKey,
+      requestFieldCacheKey,
       responseDataPath
     } = keysAndPaths;
     let fieldData = (0, _get2.default)(data, responseDataPath);
@@ -1033,7 +1038,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
         fieldData = (0, _filterOutPropsWithArgsOrDirectives.default)(fieldData, field.selectionSet.selections, keysAndPaths, context);
       }
 
-      const result = await this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hashedRequestFieldCacheKey, options, context);
+      const result = await this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hashedRequestFieldCacheKey, options, { ...context,
+        requestFieldCacheKey
+      });
 
       if (result && (0, _isObjectLike2.default)(fieldData)) {
         fieldData = this._mergeObjects(result.entry, fieldData);
@@ -1044,7 +1051,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
           cacheControl: cacheability.printCacheControl()
         },
         tag: options.tag
-      }, options, context);
+      }, options, { ...context,
+        requestFieldCacheKey
+      });
 
       if ((0, _helpers.hasChildFields)(field, {
         fragmentDefinitions: context.fragmentDefinitions
@@ -1061,12 +1070,12 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
   }
 
   _setResponseChunksAwaitingCaching(normalizedResponseData, context) {
-    const responseChunks = this._responseChunksAwaitingCaching.get(context.boxID);
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.requestID);
 
     if (responseChunks) {
-      this._responseChunksAwaitingCaching.set(context.boxID, [...responseChunks, normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.requestID, [...responseChunks, normalizedResponseData]);
     } else {
-      this._responseChunksAwaitingCaching.set(context.boxID, [normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.requestID, [normalizedResponseData]);
     }
   }