diff --git a/.changeset/early-snakes-cheer.md b/.changeset/early-snakes-cheer.md
index a3fe4b3366f..8c3b315ab80 100644
--- a/.changeset/early-snakes-cheer.md
+++ b/.changeset/early-snakes-cheer.md
@@ -2,4 +2,4 @@
 "@apollo/client": patch
 ---
 
-keep `options` reference stable when passing it thorugh QueryManager
+keep `options` reference stable when passing it through QueryManager
diff --git a/src/core/__tests__/fetchPolicies.ts b/src/core/__tests__/fetchPolicies.ts
index 2cfce116ee6..27c691aab06 100644
--- a/src/core/__tests__/fetchPolicies.ts
+++ b/src/core/__tests__/fetchPolicies.ts
@@ -814,16 +814,24 @@ describe("cache-and-network", function () {
 
 describe("nextFetchPolicy", () => {
   type TData = {
-    linkCounter: number;
-    opName: string;
-    opVars: Record<string, any>;
+    echo: {
+      linkCounter: number;
+      opName: string;
+      opVars: Record<string, any>;
+    };
+  };
+
+  type TVars = {
+    refetching?: boolean;
   };
 
   const EchoQuery: TypedDocumentNode<TData> = gql`
     query EchoQuery {
-      linkCounter
-      opName
-      opVars
+      echo {
+        linkCounter
+        opName
+        opVars
+      }
     }
   `;
 
@@ -835,9 +843,12 @@ describe("nextFetchPolicy", () => {
           setTimeout(() => {
             observer.next({
               data: {
-                linkCounter: ++linkCounter,
-                opName: request.operationName,
-                opVars: request.variables,
+                echo: {
+                  __typename: "Echo",
+                  linkCounter: ++linkCounter,
+                  opName: request.operationName,
+                  opVars: request.variables,
+                },
               },
             });
             observer.complete();
@@ -846,9 +857,9 @@ describe("nextFetchPolicy", () => {
     );
   }
 
-  const checkNextFetchPolicy = <TData, TVars extends object>(args: {
+  const checkNextFetchPolicy = (args: {
     fetchPolicy: WatchQueryFetchPolicy;
-    nextFetchPolicy: WatchQueryOptions<TVars, TData>["nextFetchPolicy"];
+    nextFetchPolicy: WatchQueryOptions<{}, TData>["nextFetchPolicy"];
     useDefaultOptions: boolean;
     onResult(info: {
       count: number;
@@ -867,7 +878,9 @@ describe("nextFetchPolicy", () => {
       (resolve, reject) => {
         const client = new ApolloClient({
           link: makeLink(),
-          cache: new InMemoryCache(),
+          cache: new InMemoryCache({
+            addTypename: true,
+          }),
           defaultOptions: {
             watchQuery: args.useDefaultOptions
               ? {
@@ -917,7 +930,8 @@ describe("nextFetchPolicy", () => {
   }) => {
     if (count === 1) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 1,
         opName: "EchoQuery",
         opVars: {},
@@ -930,7 +944,8 @@ describe("nextFetchPolicy", () => {
           refetching: true,
         })
         .then((result) => {
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 2,
             opName: "EchoQuery",
             opVars: {
@@ -941,7 +956,8 @@ describe("nextFetchPolicy", () => {
         .catch(reject);
     } else if (count === 2) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 2,
         opName: "EchoQuery",
         opVars: {
@@ -959,7 +975,8 @@ describe("nextFetchPolicy", () => {
         })
         .then((result) => {
           expect(result.loading).toBe(false);
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 3,
             opName: "EchoQuery",
             opVars: {
@@ -973,7 +990,8 @@ describe("nextFetchPolicy", () => {
       expect(observable.options.fetchPolicy).toBe("cache-first");
     } else if (count === 3) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 3,
         opName: "EchoQuery",
         opVars: {
@@ -1044,7 +1062,8 @@ describe("nextFetchPolicy", () => {
   }) => {
     if (count === 1) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 1,
         opName: "EchoQuery",
         opVars: {},
@@ -1057,7 +1076,8 @@ describe("nextFetchPolicy", () => {
           refetching: true,
         })
         .then((result) => {
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 2,
             opName: "EchoQuery",
             opVars: {
@@ -1068,7 +1088,8 @@ describe("nextFetchPolicy", () => {
         .catch(reject);
     } else if (count === 2) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 2,
         opName: "EchoQuery",
         opVars: {
@@ -1086,7 +1107,8 @@ describe("nextFetchPolicy", () => {
         })
         .then((result) => {
           expect(result.loading).toBe(false);
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 3,
             opName: "EchoQuery",
             opVars: {
@@ -1100,7 +1122,8 @@ describe("nextFetchPolicy", () => {
       // expect(observable.options.fetchPolicy).toBe("cache-and-network");
     } else if (count === 3) {
       expect(result.loading).toBe(true);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 2,
         opName: "EchoQuery",
         opVars: {
@@ -1112,7 +1135,8 @@ describe("nextFetchPolicy", () => {
       expect(observable.options.fetchPolicy).toBe("cache-first");
     } else if (count === 4) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 3,
         opName: "EchoQuery",
         opVars: {
@@ -1191,7 +1215,8 @@ describe("nextFetchPolicy", () => {
   }) => {
     if (count === 1) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 1,
         opName: "EchoQuery",
         opVars: {},
@@ -1204,7 +1229,8 @@ describe("nextFetchPolicy", () => {
           refetching: true,
         })
         .then((result) => {
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 2,
             opName: "EchoQuery",
             opVars: {
@@ -1215,7 +1241,8 @@ describe("nextFetchPolicy", () => {
         .catch(reject);
     } else if (count === 2) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 2,
         opName: "EchoQuery",
         opVars: {
@@ -1233,7 +1260,8 @@ describe("nextFetchPolicy", () => {
         })
         .then((result) => {
           expect(result.loading).toBe(false);
-          expect(result.data).toEqual({
+          expect(result.data.echo).toEqual({
+            __typename: "Echo",
             linkCounter: 2,
             opName: "EchoQuery",
             opVars: {
@@ -1250,7 +1278,8 @@ describe("nextFetchPolicy", () => {
       expect(observable.options.fetchPolicy).toBe("cache-first");
     } else if (count === 3) {
       expect(result.loading).toBe(false);
-      expect(result.data).toEqual({
+      expect(result.data.echo).toEqual({
+        __typename: "Echo",
         linkCounter: 2,
         opName: "EchoQuery",
         opVars: {