@graphql-box/cache-manager 5.4.11 → 5.4.13

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@graphql-box/cache-manager",
   "description": "The GraphQL Box cache manager module.",
-  "version": "5.4.11",
-  "author": "Dylan Aubrey",
+  "version": "5.4.13",
+  "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/graphql-box",
   "repository": {
@@ -36,8 +36,8 @@
     "cacheability": "^4.0.27",
     "core-js": "^3.39.0",
     "lodash-es": "^4.17.21",
-    "@graphql-box/helpers": "5.4.10",
-    "@graphql-box/core": "5.4.10"
+    "@graphql-box/helpers": "5.4.12",
+    "@graphql-box/core": "5.4.12"
   },
   "peerDependencies": {
     "@cachemap/core": "<6",
@@ -50,7 +50,7 @@
     "cts-types": "^0.0.8",
     "del-cli": "^6.0.0",
     "graphql": "^16.9.0",
-    "@graphql-box/test-utils": "5.4.10"
+    "@graphql-box/test-utils": "5.4.12"
   },
   "keywords": [
     "client",

package/src/__snapshots__/index.test.ts.snap

@@ -50831,8 +50831,8 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
       "dataEntities::User::MDQ6VXNlcjE3MzQ2OTc4",
       {
         "id": "MDQ6VXNlcjE3MzQ2OTc4",
-        "login": "dylanaubrey",
-        "name": "Dylan Aubrey",
+        "login": "miami-man",
+        "name": "miami-man",
       },
     ],
     [
@@ -50925,7 +50925,7 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
       "key": "dataEntities::User::MDQ6VXNlcjE3MzQ2OTc4",
       "lastAccessed": 297475200000,
       "lastUpdated": 297475200000,
-      "size": 146,
+      "size": 136,
       "tags": [],
       "updatedCount": 0,
     },
@@ -51124,8 +51124,8 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
             {
               "node": {
                 "id": "MDQ6VXNlcjE3MzQ2OTc4",
-                "login": "dylanaubrey",
-                "name": "Dylan Aubrey",
+                "login": "miami-man",
+                "name": "miami-man",
               },
             },
           ],
@@ -51161,8 +51161,8 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
       "dataEntities::User::MDQ6VXNlcjE3MzQ2OTc4",
       {
         "id": "MDQ6VXNlcjE3MzQ2OTc4",
-        "login": "dylanaubrey",
-        "name": "Dylan Aubrey",
+        "login": "miami-man",
+        "name": "miami-man",
       },
     ],
     [
@@ -51255,7 +51255,7 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
       "key": "dataEntities::User::MDQ6VXNlcjE3MzQ2OTc4",
       "lastAccessed": 297475200000,
       "lastUpdated": 297475200000,
-      "size": 146,
+      "size": 136,
       "tags": [],
       "updatedCount": 0,
     },
@@ -51454,8 +51454,8 @@ exports[`@graphql-box/cache-manager >> cacheResponse >> mutation >> nested inter
             {
               "node": {
                 "id": "MDQ6VXNlcjE3MzQ2OTc4",
-                "login": "dylanaubrey",
-                "name": "Dylan Aubrey",
+                "login": "miami-man",
+                "name": "miami-man",
               },
             },
           ],

package/src/debug/logCacheEntry.ts

@@ -21,7 +21,7 @@ export const logCacheEntry = () => {
     descriptor.value = async function descriptorValue(...args: Parameters<Descriptor>): ReturnType<Descriptor> {
       return new Promise<void>(resolve => {
         const resolver = async () => {
-          const { debugManager, requestFieldCacheKey, ...otherContext } = args[5];
+          const { data, debugManager, requestFieldCacheKey } = args[5];
 
           if (!debugManager) {
             await method.apply(this, args);
@@ -35,18 +35,15 @@ export const logCacheEntry = () => {
           const duration = endTime - startTime;
           resolve();
 
-          const payload = {
-            cacheType: args[0],
-            cachemapOptions: args[3],
-            context: otherContext,
-            options: args[4],
-            requestHash: args[1],
+          debugManager.log(CACHE_ENTRY_ADDED, {
+            data: {
+              ...data,
+              cacheHeaders: args[3].cacheHeaders,
+              cacheType: args[0],
+              ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : undefined),
+            },
             stats: { duration, endTime, startTime },
-            value: args[2],
-            ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),
-          };
-
-          debugManager.log(CACHE_ENTRY_ADDED, payload);
+          });
         };
 
         void resolver();

package/src/debug/logCacheQuery.ts

@@ -23,7 +23,7 @@ export const logCacheQuery = () => {
       // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
       return new Promise<never | undefined>(resolve => {
         const resolver = async () => {
-          const { debugManager, requestFieldCacheKey, ...otherContext } = args[3];
+          const { data, debugManager, requestFieldCacheKey } = args[3];
 
           if (!debugManager) {
             // Proving more difficult to fix, that worth the effort
@@ -40,17 +40,14 @@ export const logCacheQuery = () => {
           const duration = endTime - startTime;
           resolve(result);
 
-          const payload = {
-            cacheType: args[0],
-            context: otherContext,
-            options: args[2],
-            requestHash: args[1],
-            result,
+          debugManager.log(CACHE_ENTRY_QUERIED, {
+            data: {
+              ...data,
+              cacheType: args[0],
+              ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : undefined),
+            },
             stats: { duration, endTime, startTime },
-            ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),
-          };
-
-          debugManager.log(CACHE_ENTRY_QUERIED, payload);
+          });
         };
 
         void resolver();

package/src/debug/logPartialCompiled.ts

@@ -17,7 +17,7 @@ export const logPartialCompiled = () => {
     }
 
     descriptor.value = function descriptorValue(...args: Parameters<Descriptor>): ReturnType<Descriptor> {
-      const { debugManager, ...otherContext } = args[3];
+      const { data, debugManager } = args[3];
 
       if (!debugManager) {
         method.apply(this, args);
@@ -30,10 +30,7 @@ export const logPartialCompiled = () => {
       const duration = endTime - startTime;
 
       debugManager.log(PARTIAL_QUERY_COMPILED, {
-        context: otherContext,
-        options: args[2],
-        requestHash: args[0],
-        result: args[1],
+        data,
         stats: { duration, endTime, startTime },
       });
     };

package/src/helpers/filterQuery.ts

@@ -16,13 +16,13 @@ export const filterQuery = (
   context: CacheManagerContext,
 ) => {
   const { ast } = requestData;
-  const queryNode = getOperationDefinitions(ast, context.operation)[0];
+  const queryNode = getOperationDefinitions(ast, context.data.operation)[0];
 
   if (!queryNode) {
     return ast;
   }
 
-  const { fragmentDefinitions, operation } = context;
+  const { data, fragmentDefinitions } = context;
   const fieldsAndTypeNames = getChildFields(queryNode, { fragmentDefinitions });
 
   if (!fieldsAndTypeNames) {
@@ -39,7 +39,7 @@ export const filterQuery = (
     const { requestFieldPath } = buildFieldKeysAndPaths(
       fieldNode,
       {
-        requestFieldPath: operation,
+        requestFieldPath: data.operation,
       },
       context,
     );
@@ -49,6 +49,6 @@ export const filterQuery = (
     }
   }
 
-  context.queryFiltered = true;
+  context.data.queryFiltered = true;
   return filterFragmentDefinitions(ast, fieldPathChecklist, fragmentSpreadChecklist, context);
 };

package/src/helpers/isFirstResponseChunk.ts

@@ -4,4 +4,4 @@ import { type CacheManagerContext } from '../types.ts';
 export const isFirstResponseChunk = (
   rawResponseData: RawResponseDataWithMaybeCacheMetadata,
   context: CacheManagerContext,
-) => context.hasDeferOrStream && rawResponseData.hasNext && !rawResponseData.paths;
+) => context.deprecated.hasDeferOrStream && rawResponseData.hasNext && !rawResponseData.paths;

package/src/helpers/isLastResponseChunk.ts

@@ -4,4 +4,4 @@ import { type CacheManagerContext } from '../types.ts';
 export const isLastResponseChunk = (
   rawResponseData: RawResponseDataWithMaybeCacheMetadata,
   context: CacheManagerContext,
-) => context.hasDeferOrStream && !rawResponseData.hasNext && rawResponseData.paths;
+) => context.deprecated.hasDeferOrStream && !rawResponseData.hasNext && rawResponseData.paths;

package/src/helpers/isNotLastResponseChunk.ts

@@ -4,4 +4,4 @@ import { type CacheManagerContext } from '../types.ts';
 export const isNotLastResponseChunk = (
   rawResponseData: RawResponseDataWithMaybeCacheMetadata,
   context: CacheManagerContext,
-) => context.hasDeferOrStream && rawResponseData.hasNext;
+) => context.deprecated.hasDeferOrStream && rawResponseData.hasNext;

package/src/helpers/isNotResponseChunk.ts

@@ -4,4 +4,4 @@ import { type CacheManagerContext } from '../types.ts';
 export const isNotResponseChunk = (
   rawResponseData: RawResponseDataWithMaybeCacheMetadata,
   context: CacheManagerContext,
-) => !context.hasDeferOrStream && !rawResponseData.hasNext && !rawResponseData.paths;
+) => !context.deprecated.hasDeferOrStream && !rawResponseData.hasNext && !rawResponseData.paths;

package/src/helpers/normalizePatchResponseData.ts

@@ -6,7 +6,7 @@ export const normalizePatchResponseData = (
   rawResponseData: RawResponseDataWithMaybeCacheMetadata,
   context: CacheManagerContext,
 ) => {
-  if (!context.normalizePatchResponseData) {
+  if (!context.deprecated.normalizePatchResponseData) {
     return rawResponseData;
   }
 

package/src/index.test.ts

@@ -61,8 +61,10 @@ describe('@graphql-box/cache-manager >>', () => {
             responses.nestedInterfaceMutation,
             { awaitDataCaching: true },
             getRequestContext({
+              data: {
+                operation: OperationTypeNode.MUTATION,
+              },
               fieldTypeMap: requestFieldTypeMaps.nestedInterfaceMutation,
-              operation: OperationTypeNode.MUTATION,
             }),
           );
         });
@@ -108,8 +110,10 @@ describe('@graphql-box/cache-manager >>', () => {
             responses.nestedInterfaceMutation,
             { awaitDataCaching: true },
             getRequestContext({
+              data: {
+                operation: OperationTypeNode.MUTATION,
+              },
               fieldTypeMap: requestFieldTypeMaps.nestedInterfaceMutation,
-              operation: OperationTypeNode.MUTATION,
             }),
           );
         });
@@ -151,8 +155,10 @@ describe('@graphql-box/cache-manager >>', () => {
             responses.nestedTypeSubscription,
             { awaitDataCaching: true },
             getRequestContext({
+              data: {
+                operation: OperationTypeNode.SUBSCRIPTION,
+              },
               fieldTypeMap: requestFieldTypeMaps.nestedTypeSubscription,
-              operation: OperationTypeNode.SUBSCRIPTION,
             }),
           );
         });
@@ -195,8 +201,10 @@ describe('@graphql-box/cache-manager >>', () => {
             responses.nestedTypeSubscription,
             { awaitDataCaching: true },
             getRequestContext({
+              data: {
+                operation: OperationTypeNode.SUBSCRIPTION,
+              },
               fieldTypeMap: requestFieldTypeMaps.nestedTypeSubscription,
-              operation: OperationTypeNode.SUBSCRIPTION,
             }),
           );
         });
@@ -516,7 +524,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.singleTypeQuerySet.updated),
               responses.singleTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.singleTypeQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.singleTypeQuery }),
             );
           });
 
@@ -577,7 +585,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.singleTypeQuerySet.updated),
               responses.singleTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.singleTypeQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.singleTypeQuery }),
             );
           });
 
@@ -638,7 +646,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.nestedTypeQuerySet.updated),
               responses.nestedTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery }),
             );
           });
 
@@ -702,7 +710,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.nestedTypeQuerySet.updated),
               responses.nestedTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery }),
             );
           });
 
@@ -763,7 +771,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.nestedUnionQuerySet.updated),
               responses.nestedUnionQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery }),
             );
           });
 
@@ -825,7 +833,7 @@ describe('@graphql-box/cache-manager >>', () => {
               getRequestData(parsedRequests.nestedUnionQuerySet.updated),
               responses.nestedUnionQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery, queryFiltered: true }),
+              getRequestContext({ data: { queryFiltered: true }, fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery }),
             );
           });
 
@@ -869,7 +877,10 @@ describe('@graphql-box/cache-manager >>', () => {
               requestData,
               responses.deferQuerySet.initial,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
+              getRequestContext({
+                deprecated: { hasDeferOrStream: true },
+                fieldTypeMap: requestFieldTypeMaps.deferQuery,
+              }),
             );
 
             const { cacheMetadata, data } = responses.deferQuerySet.partial;
@@ -893,9 +904,9 @@ describe('@graphql-box/cache-manager >>', () => {
                     updateResponses.shift()!,
                     { awaitDataCaching: true },
                     getRequestContext({
+                      data: { queryFiltered: true },
+                      deprecated: { hasDeferOrStream: true },
                       fieldTypeMap: requestFieldTypeMaps.deferQuery,
-                      hasDeferOrStream: true,
-                      queryFiltered: true,
                     }),
                   );
 
@@ -1055,7 +1066,10 @@ describe('@graphql-box/cache-manager >>', () => {
           analyzeQueryResult = await cacheManager.analyzeQuery(
             getRequestData(parsedRequests.deferQuery),
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
+            getRequestContext({
+              deprecated: { hasDeferOrStream: true },
+              fieldTypeMap: requestFieldTypeMaps.deferQuery,
+            }),
           );
         });
 
@@ -1269,8 +1283,10 @@ describe('@graphql-box/cache-manager >>', () => {
                   updateResponses.shift()!,
                   { awaitDataCaching: true },
                   getRequestContext({
+                    deprecated: {
+                      hasDeferOrStream: true,
+                    },
                     fieldTypeMap: requestFieldTypeMaps.deferQuery,
-                    hasDeferOrStream: true,
                   }),
                 );
 
@@ -1285,7 +1301,10 @@ describe('@graphql-box/cache-manager >>', () => {
           analyzeQueryResult = await cacheManager.analyzeQuery(
             requestData,
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
+            getRequestContext({
+              deprecated: { hasDeferOrStream: true },
+              fieldTypeMap: requestFieldTypeMaps.deferQuery,
+            }),
           );
         });
 
@@ -1576,13 +1595,19 @@ describe('@graphql-box/cache-manager >>', () => {
             requestData,
             responses.getSearchResultsQuery,
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.getSearchResultsQuery, hasDeferOrStream: true }),
+            getRequestContext({
+              data: { hasDeferOrStream: true },
+              fieldTypeMap: requestFieldTypeMaps.getSearchResultsQuery,
+            }),
           );
 
           analyzeQueryResult = await cacheManager.analyzeQuery(
             getRequestData(parsedRequests.getMoviePreviewQuery),
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.getMoviePreviewQuery, hasDeferOrStream: true }),
+            getRequestContext({
+              data: { hasDeferOrStream: true },
+              fieldTypeMap: requestFieldTypeMaps.getMoviePreviewQuery,
+            }),
           );
         });
 
@@ -1634,13 +1659,13 @@ describe('@graphql-box/cache-manager >>', () => {
             requestData,
             responses.deferQuerySet.initial,
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
+            getRequestContext({ data: { hasDeferOrStream: true }, fieldTypeMap: requestFieldTypeMaps.deferQuery }),
           );
 
           analyzeQueryResult = await cacheManager.analyzeQuery(
             getRequestData(parsedRequests.deferQuery),
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
+            getRequestContext({ data: { hasDeferOrStream: true }, fieldTypeMap: requestFieldTypeMaps.deferQuery }),
           );
         });
 

package/src/main.ts

@@ -174,9 +174,9 @@ export class CacheManager implements CacheManagerDef {
     { propNameOrIndex, requestFieldPath }: KeysAndPaths,
     typeNamesAndKind: TypenamesAndKind,
     _options: RequestOptions,
-    { operation }: CacheManagerContext,
+    { data: ctxData }: CacheManagerContext,
   ) {
-    CacheManager._setCacheMetadata(cacheMetadata, cachedFieldData.cacheability, requestFieldPath, operation);
+    CacheManager._setCacheMetadata(cacheMetadata, cachedFieldData.cacheability, requestFieldPath, ctxData.operation);
     CacheManager._setFieldPathChecklist(fieldPathChecklist, cachedFieldData, requestFieldPath, typeNamesAndKind);
     CacheManager._setCachedData(data, cachedFieldData, propNameOrIndex);
   }
@@ -594,7 +594,7 @@ export class CacheManager implements CacheManagerDef {
     context: CacheManagerContext,
   ): CacheMetadata {
     const cacheMetadata = this._createCacheMetadata({ data, ...otherProps }, context);
-    const queryNode = getOperationDefinitions(ast, context.operation)[0];
+    const queryNode = getOperationDefinitions(ast, context.data.operation)[0];
 
     if (!queryNode) {
       return cacheMetadata;
@@ -609,7 +609,7 @@ export class CacheManager implements CacheManagerDef {
     for (const { fieldNode } of fieldsAndTypeNames)
       this._setFieldCacheability(
         fieldNode,
-        { requestFieldPath: context.operation },
+        { requestFieldPath: context.data.operation },
         { cacheMetadata, data },
         options,
         context,
@@ -661,10 +661,13 @@ export class CacheManager implements CacheManagerDef {
       let queryCacheMetadata: CacheMetadata | undefined;
       let queryData: PlainData | undefined;
 
-      if (context.operation === OperationTypeNode.QUERY && queryResponseCacheTierEnabled(this._cacheTiersEnabled)) {
+      if (
+        context.data.operation === OperationTypeNode.QUERY &&
+        queryResponseCacheTierEnabled(this._cacheTiersEnabled)
+      ) {
         let partialQueryResponse: PartialQueryResponse | undefined;
 
-        if (context.queryFiltered && updatedRequestData) {
+        if (context.data.queryFiltered && updatedRequestData) {
           dataCaching.push(
             this._setQueryResponseCacheEntry(updatedRequestData.hash, { cacheMetadata, data }, options, context),
           );
@@ -734,7 +737,7 @@ export class CacheManager implements CacheManagerDef {
 
   private _createCacheMetadata(
     { _cacheMetadata, headers }: RawResponseDataWithMaybeCacheMetadata,
-    { operation }: CacheManagerContext,
+    { data }: CacheManagerContext,
   ): CacheMetadata {
     const cacheMetadata = new Map<string, Cacheability>();
 
@@ -744,7 +747,7 @@ export class CacheManager implements CacheManagerDef {
       headers,
     });
 
-    cacheMetadata.set(operation, cacheability);
+    cacheMetadata.set(data.operation, cacheability);
 
     if (_cacheMetadata) {
       rehydrateCacheMetadata(_cacheMetadata, cacheMetadata);
@@ -841,7 +844,7 @@ export class CacheManager implements CacheManagerDef {
     const hasArgsOrDirectives = fieldTypeInfo.hasArguments || fieldTypeInfo.hasDirectives;
 
     if (
-      context.operation === OperationTypeNode.QUERY &&
+      context.data.operation === OperationTypeNode.QUERY &&
       (isEntity || hasArgsOrDirectives) &&
       requestPathCacheTierEnabled(this._cacheTiersEnabled)
     ) {
@@ -1013,7 +1016,7 @@ export class CacheManager implements CacheManagerDef {
       fieldPathChecklist: new Map(),
     };
 
-    const queryNode = getOperationDefinitions(ast, context.operation)[0];
+    const queryNode = getOperationDefinitions(ast, context.data.operation)[0];
 
     if (!queryNode) {
       return cachedResponseData;
@@ -1029,7 +1032,7 @@ export class CacheManager implements CacheManagerDef {
       fieldsAndTypeNames.map(({ fieldNode }) =>
         this._analyzeFieldNode(
           fieldNode,
-          { requestFieldPath: context.operation },
+          { requestFieldPath: context.data.operation },
           cachedResponseData,
           options,
           context,
@@ -1045,8 +1048,8 @@ export class CacheManager implements CacheManagerDef {
     normalizedResponseData: RawResponseDataWithMaybeCacheMetadata,
     context: CacheManagerContext,
   ) {
-    const responseChunks = this._responseChunksAwaitingCaching.get(context.requestID);
-    this._responseChunksAwaitingCaching.delete(context.requestID);
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.data.requestID);
+    this._responseChunksAwaitingCaching.delete(context.data.requestID);
     return mergeResponseDataSets([...(responseChunks ?? []), normalizedResponseData]);
   }
 
@@ -1072,7 +1075,7 @@ export class CacheManager implements CacheManagerDef {
     options: RequestOptions,
     context: CacheManagerContext,
   ): Promise<void> {
-    const operationNode = getOperationDefinitions(requestData.ast, context.operation)[0];
+    const operationNode = getOperationDefinitions(requestData.ast, context.data.operation)[0];
 
     if (!operationNode) {
       return;
@@ -1088,7 +1091,7 @@ export class CacheManager implements CacheManagerDef {
       fieldsAndTypeNames.map(({ fieldNode }) => {
         return this._parseEntityAndRequestFieldPathCacheEntryData(
           fieldNode,
-          { requestFieldPath: context.operation },
+          { requestFieldPath: context.data.operation },
           responseData,
           options,
           context,
@@ -1173,7 +1176,7 @@ export class CacheManager implements CacheManagerDef {
   private _setFieldTypeCacheDirective(
     cacheMetadata: CacheMetadata,
     { ancestorRequestFieldPath, requestFieldPath }: { ancestorRequestFieldPath?: string; requestFieldPath: string },
-    { fieldTypeMap, operation }: CacheManagerContext,
+    { data, fieldTypeMap }: CacheManagerContext,
   ): void {
     if (cacheMetadata.has(requestFieldPath)) {
       return;
@@ -1183,13 +1186,13 @@ export class CacheManager implements CacheManagerDef {
 
     if (fieldTypeInfo && this._typeCacheDirectives[fieldTypeInfo.typeName]) {
       const cacheability = new Cacheability({ cacheControl: this._typeCacheDirectives[fieldTypeInfo.typeName] });
-      CacheManager._setCacheMetadata(cacheMetadata, cacheability, requestFieldPath, operation);
+      CacheManager._setCacheMetadata(cacheMetadata, cacheability, requestFieldPath, data.operation);
     } else if (this._cascadeCacheControl && ancestorRequestFieldPath) {
       CacheManager._setCacheMetadata(
         cacheMetadata,
         cacheMetadata.get(ancestorRequestFieldPath),
         requestFieldPath,
-        operation,
+        data.operation,
       );
     }
   }
@@ -1211,7 +1214,7 @@ export class CacheManager implements CacheManagerDef {
     context: CacheManagerContext,
   ): Promise<void> {
     const dehydratedCacheMetadata = dehydrateCacheMetadata(cacheMetadata);
-    const cacheControl = CacheManager._getOperationCacheControl(cacheMetadata, context.operation);
+    const cacheControl = CacheManager._getOperationCacheControl(cacheMetadata, context.data.operation);
 
     await this._setCacheEntry(
       QUERY_RESPONSES,
@@ -1254,12 +1257,12 @@ export class CacheManager implements CacheManagerDef {
     normalizedResponseData: RawResponseDataWithMaybeCacheMetadata,
     context: CacheManagerContext,
   ) {
-    const responseChunks = this._responseChunksAwaitingCaching.get(context.requestID);
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.data.requestID);
 
     if (responseChunks) {
-      this._responseChunksAwaitingCaching.set(context.requestID, [...responseChunks, normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.data.requestID, [...responseChunks, normalizedResponseData]);
     } else {
-      this._responseChunksAwaitingCaching.set(context.requestID, [normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.data.requestID, [normalizedResponseData]);
     }
   }
 }