diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCaches.cs b/src/Umbraco.Web/PublishedCache/IPublishedCaches.cs
index 21652d9ed2..3125656c79 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedCaches.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedCaches.cs
@@ -20,5 +20,19 @@ namespace Umbraco.Web.PublishedCache
         /// Gets the media cache.
         /// </summary>
         IPublishedMediaCache MediaCache { get; }
+
+        /// <summary>
+        /// Creates a contextual content cache for a specified context.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <returns>A new contextual content cache for the specified context.</returns>
+        ContextualPublishedContentCache CreateContextualContentCache(UmbracoContext context);
+
+        /// <summary>
+        /// Creates a contextual media cache for a specified context.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <returns>A new contextual media cache for the specified context.</returns>
+        ContextualPublishedMediaCache CreateContextualMediaCache(UmbracoContext context);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/PublishedCaches.cs b/src/Umbraco.Web/PublishedCache/PublishedCaches.cs
index 146677418b..7aa7e2f501 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedCaches.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedCaches.cs
@@ -25,5 +25,25 @@
         /// Gets the media cache.
         /// </summary>
         public IPublishedMediaCache MediaCache { get; private set; }
+
+        /// <summary>
+        /// Creates a contextual content cache for a specified context.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <returns>A new contextual content cache for the specified context.</returns>
+        public ContextualPublishedContentCache CreateContextualContentCache(UmbracoContext context)
+        {
+            return new ContextualPublishedContentCache(ContentCache, context);
+        }
+
+        /// <summary>
+        /// Creates a contextual media cache for a specified context.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <returns>A new contextual media cache for the specified context.</returns>
+        public ContextualPublishedMediaCache CreateContextualMediaCache(UmbracoContext context)
+        {
+            return new ContextualPublishedMediaCache(MediaCache, context);            
+        }
     }
 }
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index d8bcf76fdd..7c5663660a 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -135,8 +135,8 @@ namespace Umbraco.Web
             Application = applicationContext;
             Security = new WebSecurity();
 
-            ContentCache = new ContextualPublishedContentCache(publishedCaches.ContentCache, this);
-            MediaCache = new ContextualPublishedMediaCache(publishedCaches.MediaCache, this);
+            ContentCache = publishedCaches.CreateContextualContentCache(this);
+            MediaCache = publishedCaches.CreateContextualMediaCache(this);
             InPreviewMode = preview ?? DetectInPreviewModeFromRequest();
 
 			// set the urls...