diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index b9c7aa31dd..f91b6fcf48 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -84,7 +84,7 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCachingServices();
+            services.AddCaching();
             services.AddSessionServices();
 
             // Configure Auth
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
index 158da2891f..78c18cdd3f 100644
--- a/src/MusicStore/StartupNtlmAuthentication.cs
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -58,7 +58,7 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCachingServices();
+            services.AddCaching();
             services.AddSessionServices();
 
             // Configure Auth
diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
index 452373eaef..675294882e 100644
--- a/src/MusicStore/StartupOpenIdConnect.cs
+++ b/src/MusicStore/StartupOpenIdConnect.cs
@@ -78,7 +78,7 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCachingServices();
+            services.AddCaching();
             services.AddSessionServices();
 
             // Configure Auth
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
index 1792538183..8d3130bb15 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
@@ -84,7 +84,7 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCachingServices();
+            services.AddCaching();
             services.AddSessionServices();
 
             // Configure Auth
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
index eb7ce53344..084c7eaa0c 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
@@ -145,7 +145,7 @@ namespace MusicStore
             services.AddSingleton<IMemoryCache, MemoryCache>();
 
             // Add session related services.
-            services.AddCachingServices();
+            services.AddCaching();
             services.AddSessionServices();
 
             // Configure Auth