diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs
index 3ad7556c92..54c0feeea0 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;
 using Umbraco.Infrastructure.Cache;
-using Umbraco.Web;
+using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Search;
diff --git a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs
similarity index 96%
rename from src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
rename to src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs
index 6900354202..c265461c99 100644
--- a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs
@@ -12,8 +12,9 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Sync;
+using Umbraco.Web;
 
-namespace Umbraco.Web
+namespace Umbraco.Core.Sync
 {
     /// <summary>
     /// An <see cref="IServerMessenger"/> implementation that works by storing messages in the database.
@@ -61,7 +62,8 @@ namespace Umbraco.Web
         public override void SendMessages()
         {
             var batch = GetBatch(false);
-            if (batch == null) return;
+            if (batch == null)
+                return;
 
             var instructions = batch.SelectMany(x => x.Instructions).ToArray();
             batch.Clear();
@@ -95,7 +97,8 @@ namespace Umbraco.Web
         {
             var key = nameof(BatchedDatabaseServerMessenger);
 
-            if (!_requestCache.IsAvailable) return null;
+            if (!_requestCache.IsAvailable)
+                return null;
 
             // no thread-safety here because it'll run in only 1 thread (request) at a time
             var batch = (ICollection<RefreshInstructionEnvelope>)_requestCache.Get(key);