diff --git a/libs/product/src/drivers/magento/product.service.spec.ts b/libs/product/src/drivers/magento/product.service.spec.ts
index 55de7a676a..b487c53543 100644
--- a/libs/product/src/drivers/magento/product.service.spec.ts
+++ b/libs/product/src/drivers/magento/product.service.spec.ts
@@ -1,14 +1,11 @@
+import {InMemoryCache} from '@apollo/client/core';
+import {addTypenameToDocument} from '@apollo/client/utilities';
 import { TestBed } from '@angular/core/testing';
 import {
 	ApolloTestingModule,
 	ApolloTestingController,
 	APOLLO_TESTING_CACHE,
 } from 'apollo-angular/testing';
-import {
-	InMemoryCache,
-	IntrospectionFragmentMatcher,
-} from 'apollo-cache-inmemory';
-import { addTypenameToDocument } from 'apollo-utilities';
 
 import { GetProductQuery, MagentoSimpleProduct } from '@daffodil/product';
 import {
@@ -33,9 +30,7 @@ describe('Product | Magento | ProductService', () => {
 					provide: APOLLO_TESTING_CACHE,
 					useValue: new InMemoryCache({
 						addTypename: true,
-						fragmentMatcher: new IntrospectionFragmentMatcher({
-							introspectionQueryResultData: schema,
-						}),
+						possibleTypes: schema.possibleTypes,
 					}),
 				},
 			],
diff --git a/libs/product/src/drivers/magento/product.service.ts b/libs/product/src/drivers/magento/product.service.ts
index d6b72473ce..f24b0f9e40 100644
--- a/libs/product/src/drivers/magento/product.service.ts
+++ b/libs/product/src/drivers/magento/product.service.ts
@@ -1,10 +1,9 @@
+import {Apollo} from 'apollo-angular';
 import { Injectable } from '@angular/core';
 
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { Apollo } from 'apollo-angular';
-
 import { DaffProductServiceInterface } from '../interfaces/product-service.interface';
 import { GetAllProductsQuery } from './queries/get-all-products';
 import { GetProductQuery } from './queries/get-product';
@@ -17,7 +16,7 @@ import { DaffProduct } from '../../models/product';
 @Injectable({
   providedIn: 'root'
 })
-export class DaffMagentoProductService implements DaffProductServiceInterface {  
+export class DaffMagentoProductService implements DaffProductServiceInterface {
   constructor(private apollo: Apollo) {}
 
   /**
diff --git a/libs/product/src/drivers/magento/queries/fragments/bundled-product.ts b/libs/product/src/drivers/magento/queries/fragments/bundled-product.ts
index b71660bf0a..889b926d2f 100644
--- a/libs/product/src/drivers/magento/queries/fragments/bundled-product.ts
+++ b/libs/product/src/drivers/magento/queries/fragments/bundled-product.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const magentoBundledProductFragment = gql`
   fragment magentoBundledProduct on BundleProduct {
diff --git a/libs/product/src/drivers/magento/queries/fragments/configurable-product.ts b/libs/product/src/drivers/magento/queries/fragments/configurable-product.ts
index 23ab30b186..db8667b9b1 100644
--- a/libs/product/src/drivers/magento/queries/fragments/configurable-product.ts
+++ b/libs/product/src/drivers/magento/queries/fragments/configurable-product.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const magentoConfigurableProductFragment = gql`
   fragment magentoConfigurableProduct on ConfigurableProduct {
diff --git a/libs/product/src/drivers/magento/queries/fragments/product.ts b/libs/product/src/drivers/magento/queries/fragments/product.ts
index eb606b8100..58273c1d3b 100644
--- a/libs/product/src/drivers/magento/queries/fragments/product.ts
+++ b/libs/product/src/drivers/magento/queries/fragments/product.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 import { magentoBundledProductFragment } from './bundled-product';
 import { magentoSimpleProductFragment } from './simple-product';
 import { magentoConfigurableProductFragment } from './configurable-product';
diff --git a/libs/product/src/drivers/magento/queries/fragments/simple-product.ts b/libs/product/src/drivers/magento/queries/fragments/simple-product.ts
index 8c5ccb0105..cc7db50e2f 100644
--- a/libs/product/src/drivers/magento/queries/fragments/simple-product.ts
+++ b/libs/product/src/drivers/magento/queries/fragments/simple-product.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const magentoSimpleProductFragment = gql`
   fragment magentoSimpleProduct on SimpleProduct {
diff --git a/libs/product/src/drivers/magento/queries/get-all-products.ts b/libs/product/src/drivers/magento/queries/get-all-products.ts
index 0eff9ba9c2..f9e1c666b3 100644
--- a/libs/product/src/drivers/magento/queries/get-all-products.ts
+++ b/libs/product/src/drivers/magento/queries/get-all-products.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 import { magentoProductFragment } from './fragments/product';
 
 export const GetAllProductsQuery = gql`
diff --git a/libs/product/src/drivers/magento/queries/get-product.ts b/libs/product/src/drivers/magento/queries/get-product.ts
index 321ddf8ebb..a369a84f14 100644
--- a/libs/product/src/drivers/magento/queries/get-product.ts
+++ b/libs/product/src/drivers/magento/queries/get-product.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 import { magentoProductFragment } from './fragments/product';
 
 export const GetProductQuery = gql`
diff --git a/libs/product/src/drivers/shopify/product.service.ts b/libs/product/src/drivers/shopify/product.service.ts
index b253e36a6d..5224beb74e 100644
--- a/libs/product/src/drivers/shopify/product.service.ts
+++ b/libs/product/src/drivers/shopify/product.service.ts
@@ -1,11 +1,9 @@
+import {Apollo, gql} from 'apollo-angular';
 import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { Apollo } from 'apollo-angular';
-import gql from 'graphql-tag';
-
 import { DaffProduct } from '../../models/product';
 import { DaffProductServiceInterface } from '../interfaces/product-service.interface';