From d46545faa01a3a8f0a7dad086de6888ccdaf0e8e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Jan 2021 13:01:49 +1100
Subject: [PATCH] For now, we explicitly require AddDistributedCache in Startup
 so it's not called twice.

---
 .../DependencyInjection/UmbracoBuilderExtensions.cs            | 3 +--
 src/Umbraco.Web.UI.NetCore/Startup.cs                          | 2 ++
 .../DependencyInjection/UmbracoBuilderExtensions.cs            | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
index 0d12fae687..6bb75e774a 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -43,8 +43,7 @@ namespace Umbraco.Web.BackOffice.DependencyInjection
                 .AddMvcAndRazor()
                 .AddWebServer()
                 .AddPreviewSupport()
-                .AddHostedServices()
-                .AddDistributedCache();
+                .AddHostedServices();
 
         /// <summary>
         /// Adds Umbraco back office authentication requirements
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 46f7b2d7ae..5b262098e6 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Core.DependencyInjection;
 using Umbraco.Extensions;
+using Umbraco.Infrastructure.DependencyInjection;
 using Umbraco.Web.BackOffice.DependencyInjection;
 using Umbraco.Web.BackOffice.Security;
 using Umbraco.Web.Common.DependencyInjection;
@@ -47,6 +48,7 @@ namespace Umbraco.Web.UI.NetCore
             services.AddUmbraco(_env, _config)
                 .AddBackOffice()
                 .AddWebsite()
+                .AddDistributedCache()
                 .AddComposers()
                 .Build();
 #pragma warning restore IDE0022 // Use expression body for methods
diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
index 52f6d5df11..41292b9415 100644
--- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -43,8 +43,6 @@ namespace Umbraco.Web.Website.DependencyInjection
             builder.Services.AddScoped<UmbracoRouteValueTransformer>();
             builder.Services.AddSingleton<IUmbracoRenderingDefaults, UmbracoRenderingDefaults>();
 
-            builder.AddDistributedCache();
-
             return builder;
         }