diff --git a/src/Umbraco.PublishedCache.NuCache/Extensions/NuCacheUmbracoBuilderExtensions.cs b/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs
similarity index 95%
rename from src/Umbraco.PublishedCache.NuCache/Extensions/NuCacheUmbracoBuilderExtensions.cs
rename to src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs
index ee0b0e2630..719d014296 100644
--- a/src/Umbraco.PublishedCache.NuCache/Extensions/NuCacheUmbracoBuilderExtensions.cs
+++ b/src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -9,12 +9,12 @@ using Umbraco.Infrastructure.PublishedCache.Persistence;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
 
-namespace Umbraco.Infrastructure.PublishedCache.Extensions
+namespace Umbraco.Infrastructure.PublishedCache.DependencyInjection
 {
     /// <summary>
     /// Extension methods for <see cref="IUmbracoBuilder"/> for the Umbraco's NuCache
     /// </summary>
-    public static class NuCacheUmbracoBuilderExtensions
+    public static class UmbracoBuilderExtensions
     {
         /// <summary>
         /// Adds Umbraco NuCache dependencies
diff --git a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/BackOfficeAssetsControllerTests.cs b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/BackOfficeAssetsControllerTests.cs
index 7c9ab2daf3..9d49ec22fa 100644
--- a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/BackOfficeAssetsControllerTests.cs
+++ b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/BackOfficeAssetsControllerTests.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Tests.Testing;
@@ -7,7 +7,7 @@ using Umbraco.Web.BackOffice.Controllers;
 namespace Umbraco.Tests.Integration.TestServerTest.Controllers
 {
     [TestFixture]
-    public class BackOfficeAssetsControllerTests: UmbracoTestServerTestBase
+    public class BackOfficeAssetsControllerTests : UmbracoTestServerTestBase
     {
         [Test]
         public async Task EnsureSuccessStatusCode()
diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
index 416d0f5835..ef3735032e 100644
--- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
+++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -15,6 +15,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.DependencyInjection;
 using Umbraco.Extensions;
+using Umbraco.Infrastructure.PublishedCache.DependencyInjection;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web;
@@ -153,6 +154,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
                     mvcBuilder.AddApplicationPart(typeof(SurfaceController).Assembly);
                 })
                 .AddWebServer()
+                .AddNuCache()
                 .Build();
         }
 
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
index dc85644239..e8c6171f01 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -2,7 +2,7 @@ using System;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Core.DependencyInjection;
-using Umbraco.Infrastructure.PublishedCache.Extensions;
+using Umbraco.Infrastructure.PublishedCache.DependencyInjection;
 using Umbraco.Web.BackOffice.Authorization;
 using Umbraco.Web.BackOffice.Security;
 using Umbraco.Web.BackOffice.Trees;
diff --git a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
index 579950c23a..f495c09d3c 100644
--- a/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Core.DependencyInjection;
-using Umbraco.Infrastructure.PublishedCache.Extensions;
+using Umbraco.Infrastructure.PublishedCache.DependencyInjection;
 using Umbraco.Web.Website.Controllers;
 using Umbraco.Web.Website.Routing;
 using Umbraco.Web.Website.ViewEngines;