diff --git a/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs
index 7b4fac8dbe..afd3bbd7c2 100644
--- a/shared/Mocks/StartupOpenIdConnectTesting.cs
+++ b/shared/Mocks/StartupOpenIdConnectTesting.cs
@@ -80,7 +80,8 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCaching();
+            services.AddMemoryCache();
+            services.AddDistributedMemoryCache();
             services.AddSession();
 
             // Add the system clock service
diff --git a/shared/Mocks/StartupSocialTesting.cs b/shared/Mocks/StartupSocialTesting.cs
index 369bd89ed3..36b4bbf974 100644
--- a/shared/Mocks/StartupSocialTesting.cs
+++ b/shared/Mocks/StartupSocialTesting.cs
@@ -89,7 +89,8 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCaching();
+            services.AddMemoryCache();
+            services.AddDistributedMemoryCache();
             services.AddSession();
 
             // Add the system clock service
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 2972fdbf2c..1ffc59169e 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -76,7 +76,8 @@ namespace MusicStore
             services.AddMvc();
 
             // Add memory cache services
-            services.AddCaching();
+            services.AddMemoryCache();
+            services.AddDistributedMemoryCache();
 
             // Add session related services.
             services.AddSession();
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
index e95e93c315..4dbc678d59 100644
--- a/src/MusicStore/StartupNtlmAuthentication.cs
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -74,7 +74,8 @@ namespace MusicStore
             services.AddMvc();
 
             // Add memory cache services
-            services.AddCaching();
+            services.AddMemoryCache();
+            services.AddDistributedMemoryCache();
 
             // Add session related services.
             services.AddSession();
diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
index 2b818e7576..bcef87c741 100644
--- a/src/MusicStore/StartupOpenIdConnect.cs
+++ b/src/MusicStore/StartupOpenIdConnect.cs
@@ -87,7 +87,8 @@ namespace MusicStore
             services.AddMvc();
 
             // Add memory cache services
-            services.AddCaching();
+            services.AddMemoryCache();
+            services.AddDistributedMemoryCache();
 
             // Add session related services.
             services.AddSession();