diff --git a/src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs b/src/Umbraco.Abstractions/Cache/CacheRefresherEventArgs.cs
similarity index 100%
rename from src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs
rename to src/Umbraco.Abstractions/Cache/CacheRefresherEventArgs.cs
diff --git a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs b/src/Umbraco.Abstractions/Cache/DeepCloneAppCache.cs
similarity index 98%
rename from src/Umbraco.Core/Cache/DeepCloneAppCache.cs
rename to src/Umbraco.Abstractions/Cache/DeepCloneAppCache.cs
index 90367e0627..452f897372 100644
--- a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs
+++ b/src/Umbraco.Abstractions/Cache/DeepCloneAppCache.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Cache
     /// instance, and ensuring that all inserts and returns are deep cloned copies of the cache item,
     /// when the item is deep-cloneable.
     /// </summary>
-    internal class DeepCloneAppCache : IAppPolicyCache
+    public class DeepCloneAppCache : IAppPolicyCache
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeepCloneAppCache"/> class.
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Gets the inner cache.
         /// </summary>
-        public IAppPolicyCache InnerCache { get; }
+        private IAppPolicyCache InnerCache { get; }
 
         /// <inheritdoc />
         public object Get(string key)
diff --git a/src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs b/src/Umbraco.Abstractions/Cache/RepositoryCachePolicyOptions.cs
similarity index 97%
rename from src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs
rename to src/Umbraco.Abstractions/Cache/RepositoryCachePolicyOptions.cs
index 72baa05564..06095f058d 100644
--- a/src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs
+++ b/src/Umbraco.Abstractions/Cache/RepositoryCachePolicyOptions.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// Specifies how a repository cache policy should cache entities.
     /// </summary>
-    internal class RepositoryCachePolicyOptions
+    public class RepositoryCachePolicyOptions
     {
         /// <summary>
         /// Ctor - sets GetAllCacheValidateCount = true
diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
index 4a3654ede6..a5e5a94520 100644
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
@@ -6,4 +6,8 @@
         <RootNamespace>Umbraco.Core</RootNamespace>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Core/Cache/AppCaches.cs b/src/Umbraco.Core/Cache/AppCaches.cs
index fbfc4c8c82..5e8c460ae4 100644
--- a/src/Umbraco.Core/Cache/AppCaches.cs
+++ b/src/Umbraco.Core/Cache/AppCaches.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Web;
 
 namespace Umbraco.Core.Cache
 {
@@ -8,23 +7,6 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public class AppCaches
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches()
-            : this(HttpRuntime.Cache)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches(System.Web.Caching.Cache cache)
-            : this(
-                new WebCachingAppCache(cache),
-                new HttpRequestAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()))
-        { }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AppCaches"/> with cache providers.
         /// </summary>
diff --git a/src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs b/src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs
index c11309c827..e4102e8684 100644
--- a/src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs
+++ b/src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Cache
     /// <para>If options.GetAllCacheAllowZeroCount then a 'zero-count' array is cached when GetAll finds nothing.</para>
     /// <para>If options.GetAllCacheValidateCount then we check against the db when getting many entities.</para>
     /// </remarks>
-    internal class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
+    public class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
         where TEntity : class, IEntity
     {
         private static readonly TEntity[] EmptyEntities = new TEntity[0]; // const
diff --git a/src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs b/src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs
index 27fe4e3035..33258cbf06 100644
--- a/src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs
+++ b/src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Cache
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity.</typeparam>
     /// <typeparam name="TId">The type of the identifier.</typeparam>
-    internal abstract class RepositoryCachePolicyBase<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
+    public abstract class RepositoryCachePolicyBase<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
         where TEntity : class, IEntity
     {
         private readonly IAppPolicyCache _globalCache;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 9a2040fe00..190c5f7434 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -124,16 +124,14 @@
       <DependentUpon>Constants.cs</DependentUpon>
     </Compile>
     -->
+    <Compile Include="Cache\CacheRefresherBase.cs" />
+    <Compile Include="Cache\DefaultRepositoryCachePolicy.cs" />
     <Compile Include="Cache\FastDictionaryAppCacheBase.cs" />
     <Compile Include="Cache\ObjectCacheAppCache.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="Cache\AppCaches.cs" />
-    <Compile Include="Cache\CacheRefresherBase.cs" />
     <Compile Include="Cache\CacheRefresherCollection.cs" />
     <Compile Include="Cache\CacheRefresherCollectionBuilder.cs" />
-    <Compile Include="Cache\CacheRefresherEventArgs.cs" />
-    <Compile Include="Cache\DeepCloneAppCache.cs" />
-    <Compile Include="Cache\DefaultRepositoryCachePolicy.cs" />
     <Compile Include="Cache\FastDictionaryAppCache.cs" />
     <Compile Include="Cache\FullDataSetRepositoryCachePolicy.cs" />
     <Compile Include="Cache\HttpRequestAppCache.cs" />
@@ -141,7 +139,6 @@
     <Compile Include="Cache\JsonCacheRefresherBase.cs" />
     <Compile Include="Cache\PayloadCacheRefresherBase.cs" />
     <Compile Include="Cache\RepositoryCachePolicyBase.cs" />
-    <Compile Include="Cache\RepositoryCachePolicyOptions.cs" />
     <Compile Include="Cache\SingleItemsOnlyRepositoryCachePolicy.cs" />
     <Compile Include="Cache\TypedCacheRefresherBase.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
index e2fc4b4705..b84a79b3d1 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             base.SetUp();
 
-            _appCaches = new AppCaches();
+            _appCaches = AppCaches.Disabled;
             CreateTestData();
         }
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 60e86ad5b0..b1e2f24564 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -59,7 +59,7 @@ namespace Umbraco.Tests.Runtimes
             var logger = new ConsoleLogger(new MessageTemplates());
             var profiler = new LogProfiler(logger);
             var profilingLogger = new ProfilingLogger(logger, profiler);
-            var appCaches = new AppCaches(); // FIXME: has HttpRuntime stuff?
+            var appCaches = AppCaches.Disabled; 
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()));
             var typeLoader = new TypeLoader(appCaches.RuntimeCache, IOHelper.MapPath("~/App_Data/TEMP"), profilingLogger);
             var mainDom = new SimpleMainDom();