diff --git a/src/Umbraco.Abstractions/Composing/IPublishedCacheComposer .cs b/src/Umbraco.Abstractions/Composing/IPublishedCacheComposer .cs
new file mode 100644
index 0000000000..d88eb44ea3
--- /dev/null
+++ b/src/Umbraco.Abstractions/Composing/IPublishedCacheComposer .cs	
@@ -0,0 +1,5 @@
+namespace Umbraco.Core.Composing
+{
+    public interface IPublishedCacheComposer  : ICoreComposer
+    { }
+}
diff --git a/src/Umbraco.Infrastructure.PublishedCache/DefaultCultureAccessor.cs b/src/Umbraco.Abstractions/PublishedCache/DefaultCultureAccessor.cs
similarity index 100%
rename from src/Umbraco.Infrastructure.PublishedCache/DefaultCultureAccessor.cs
rename to src/Umbraco.Abstractions/PublishedCache/DefaultCultureAccessor.cs
diff --git a/src/Umbraco.Abstractions/PublishedCache/IPublishedElementFactory.cs b/src/Umbraco.Abstractions/PublishedCache/IPublishedElementFactory.cs
new file mode 100644
index 0000000000..4de3cb0300
--- /dev/null
+++ b/src/Umbraco.Abstractions/PublishedCache/IPublishedElementFactory.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Web.PublishedCache
+{
+    public interface IPublishedElementFactory
+    {
+        
+    }
+}
diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedElement.cs b/src/Umbraco.Abstractions/PublishedCache/PublishedElement.cs
similarity index 100%
rename from src/Umbraco.Infrastructure.PublishedCache/PublishedElement.cs
rename to src/Umbraco.Abstractions/PublishedCache/PublishedElement.cs
diff --git a/src/Umbraco.Infrastructure.PublishedCache/PublishedElementPropertyBase.cs b/src/Umbraco.Abstractions/PublishedCache/PublishedElementPropertyBase.cs
similarity index 100%
rename from src/Umbraco.Infrastructure.PublishedCache/PublishedElementPropertyBase.cs
rename to src/Umbraco.Abstractions/PublishedCache/PublishedElementPropertyBase.cs
diff --git a/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs
index 06a2bdbe81..d3b1777163 100644
--- a/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs
+++ b/src/Umbraco.Infrastructure.PublishedCache/NuCache/NuCacheComposer.cs
@@ -8,7 +8,7 @@ using Umbraco.Web.PublishedCache.NuCache.DataSource;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
-    public class NuCacheComposer : ComponentComposer<NuCacheComponent>, ICoreComposer
+    public class NuCacheComposer : ComponentComposer<NuCacheComponent>, IPublishedCacheComposer
     {
         public override void Compose(Composition composition)
         {
@@ -32,7 +32,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     idkSvc.SetMapper(UmbracoObjectTypes.Document, id => publishedSnapshotService.GetDocumentUid(id), uid => publishedSnapshotService.GetDocumentId(uid));
                     idkSvc.SetMapper(UmbracoObjectTypes.Media, id => publishedSnapshotService.GetMediaUid(id), uid => publishedSnapshotService.GetMediaId(uid));
-                }                
+                }
                 return idkSvc;
             });
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index d5138953cf..bb8a3f7e18 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -3,19 +3,16 @@ using System.Reflection;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Composing;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded.Building;
 using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web;
-using Umbraco.Web.PublishedCache.NuCache;
-using Umbraco.Web.Features;
 
 namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
 
 
-    [ComposeBefore(typeof(NuCacheComposer))]
+    [ComposeBefore(typeof(IPublishedCacheComposer))]
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public sealed class ModelsBuilderComposer : ICoreComposer
     {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 1b9e78728d..073a6566d0 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -105,10 +105,6 @@
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
       <Name>Umbraco.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Infrastructure.PublishedCache\Umbraco.Infrastructure.PublishedCache.csproj">
-      <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
-      <Name>Umbraco.Infrastructure.PublishedCache</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
       <Name>Umbraco.Infrastructure</Name>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index fd20d0cea1..d1e9d0c47a 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -120,6 +120,10 @@
       <Name>Umbraco.Examine.Lucene</Name>
       <Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Infrastructure.PublishedCache\Umbraco.Infrastructure.PublishedCache.csproj">
+      <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
+      <Name>Umbraco.Infrastructure.PublishedCache</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj">
       <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
       <Name>Umbraco.ModelsBuilder.Embedded</Name>
@@ -427,4 +431,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ed5cee711a..f4441650a2 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -116,10 +116,6 @@
       <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
       <Name>Umbraco.Examine</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Infrastructure.PublishedCache\Umbraco.Infrastructure.PublishedCache.csproj">
-      <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
-      <Name>Umbraco.Infrastructure.PublishedCache</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
       <Name>Umbraco.Infrastructure</Name>