diff --git a/src/Umbraco.Web/ContextualPublishedCacheExtensions.cs b/src/Umbraco.Web/ContextualPublishedCacheExtensions.cs
index 2a75c79c14..cc832366a4 100644
--- a/src/Umbraco.Web/ContextualPublishedCacheExtensions.cs
+++ b/src/Umbraco.Web/ContextualPublishedCacheExtensions.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web
     /// <summary>
     /// Provides extension methods to ContextualPublishedCache.
     /// </summary>
-    internal static class ContextualPublishedCacheExtensions
+    public static class ContextualPublishedCacheExtensions
     {
         /// <summary>
         /// Gets a dynamic content identified by its unique identifier.
diff --git a/src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs b/src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
index fbaf997a85..a20b5d8f76 100644
--- a/src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
+++ b/src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.PublishedCache
     /// <summary>
     /// Provides access to cached contents in a specified context.
     /// </summary>
-    internal abstract class ContextualPublishedCache
+    public abstract class ContextualPublishedCache
     {
         protected readonly UmbracoContext UmbracoContext;
         private readonly IPublishedCache _cache;
diff --git a/src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
index bdbd0265b5..86b4105368 100644
--- a/src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.PublishedCache
     /// <summary>
     /// Provides access to cached documents in a specified context.
     /// </summary>
-    internal class ContextualPublishedContentCache : ContextualPublishedCache
+    public class ContextualPublishedContentCache : ContextualPublishedCache
     {
         private readonly IPublishedContentCache _cache;
 
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PublishedCache
         /// </summary>
         /// <param name="cache">A published content cache.</param>
         /// <param name="umbracoContext">A context.</param>
-        public ContextualPublishedContentCache(IPublishedContentCache cache, UmbracoContext umbracoContext)
+        internal ContextualPublishedContentCache(IPublishedContentCache cache, UmbracoContext umbracoContext)
             : base(umbracoContext, cache)
         {
             _cache = cache;
diff --git a/src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
index c98cf5792c..bad55b4896 100644
--- a/src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.PublishedCache
     /// <summary>
     /// Provides access to cached medias in a specified context.
     /// </summary>
-    internal class ContextualPublishedMediaCache : ContextualPublishedCache
+    public class ContextualPublishedMediaCache : ContextualPublishedCache
     {
         private readonly IPublishedMediaCache _cache;
 
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PublishedCache
         /// </summary>
         /// <param name="cache">A published media cache.</param>
         /// <param name="umbracoContext">A context.</param>
-        public ContextualPublishedMediaCache(IPublishedMediaCache cache, UmbracoContext umbracoContext)
+        internal ContextualPublishedMediaCache(IPublishedMediaCache cache, UmbracoContext umbracoContext)
             : base(umbracoContext, cache)
         {
             _cache = cache;
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
index cee82a0dbc..c0a25e47fd 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web.PublishedCache
     /// </summary>
     [UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1153",
         "We need to create something like the IPublishListener interface to have proper published content storage.")]
-    internal interface IPublishedCache
+    public interface IPublishedCache
     {
 	    /// <summary>
 	    /// Gets a content identified by its unique identifier.
diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index 8ef14d86d2..f8e270a16c 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides urls using the <c>umbracoUrlAlias</c> property.
     /// </summary>
-    internal class AliasUrlProvider : IUrlProvider
+    public class AliasUrlProvider : IUrlProvider
     {
         // note - at the moment we seem to accept pretty much anything as an alias
         // without any form of validation ... could even prob. kill the XPath ...
diff --git a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
index 5de138efed..9bae24c5dd 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Routing
 	/// <remarks>
 	/// <para>Handles <c>/1234</c> where <c>1234</c> is the identified of a document.</para>
 	/// </remarks>
-	internal class ContentFinderByIdPath : IContentFinder
+	public class ContentFinderByIdPath : IContentFinder
     {
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
index cf1978c323..1181ac3195 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
 	/// Provides an implementation of <see cref="IContentFinder"/> that runs the legacy 404 logic.
 	/// </summary>
-	internal class ContentFinderByLegacy404 : IContentFinder
+	public class ContentFinderByLegacy404 : IContentFinder
 	{
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByNiceUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByNiceUrl.cs
index 1d2e5c679a..529d027ea1 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByNiceUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByNiceUrl.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Routing
 	/// <remarks>
 	/// <para>Handles <c>/foo/bar</c> where <c>/foo/bar</c> is the nice url of a document.</para>
 	/// </remarks>
-	internal class ContentFinderByNiceUrl : IContentFinder
+    public class ContentFinderByNiceUrl : IContentFinder
     {
 	    /// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
index 66ef9b7b60..21fd81a8e4 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Routing
 	/// <para>Handles <c>/foo/bar/template</c> where <c>/foo/bar</c> is the nice url of a document, and <c>template</c> a template alias.</para>
 	/// <para>If successful, then the template of the document request is also assigned.</para>
 	/// </remarks>
-    internal class ContentFinderByNiceUrlAndTemplate : ContentFinderByNiceUrl
+    public class ContentFinderByNiceUrlAndTemplate : ContentFinderByNiceUrl
     {
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandler.cs b/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandler.cs
index e4ab58fa36..3231186014 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandler.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandler.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Routing
 	/// Provides an implementation of <see cref="IContentFinder"/> that runs a legacy NotFoundHandler.
 	/// </summary>
 	/// <remarks>Provided for backward compatibility.</remarks>
-	internal class ContentFinderByNotFoundHandler<THandler> : IContentFinder
+	public class ContentFinderByNotFoundHandler<THandler> : IContentFinder
 	{
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandlers.cs b/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandlers.cs
index 19c056a587..6c10a45dd7 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandlers.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByNotFoundHandlers.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
 	/// Provides an implementation of <see cref="IContentFinder"/> that runs legacy <c>INotFoundHandler</c>.
 	/// </summary>
-    internal class ContentFinderByNotFoundHandlers : IContentFinder
+    public class ContentFinderByNotFoundHandlers : IContentFinder
     {
 		// notes
 		//
diff --git a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
index 29c6650672..4732895311 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Routing
 	/// This is used by library.RenderTemplate and also some of the macro rendering functionality like in
 	/// insertMacro.aspx and macroResultWrapper.aspx
 	/// </remarks>
-	internal class ContentFinderByPageIdQuery : IContentFinder
+    public class ContentFinderByPageIdQuery : IContentFinder
 	{
 		public bool TryFindContent(PublishedContentRequest docRequest)
 		{
diff --git a/src/Umbraco.Web/Routing/ContentFinderByProfile.cs b/src/Umbraco.Web/Routing/ContentFinderByProfile.cs
index d637f24a71..4dfe8a1da6 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByProfile.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByProfile.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Routing
 	/// <para>This should rather be done with a rewriting rule. There would be multiple profile pages in multi-sites/multi-langs setups.
 	/// We keep it for backward compatility reasons.</para>
 	/// </remarks>
-    internal class ContentFinderByProfile : ContentFinderByNiceUrl
+    public class ContentFinderByProfile : ContentFinderByNiceUrl
     {
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index 05e5b2c168..8779ce0100 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Routing
 	/// <para>Handles <c>/just/about/anything</c> where <c>/just/about/anything</c> is contained in the <c>umbracoUrlAlias</c> property of a document.</para>
 	/// <para>The alias is the full path to the document. There can be more than one alias, separated by commas.</para>
 	/// </remarks>
-	internal class ContentFinderByUrlAlias : IContentFinder
+    public class ContentFinderByUrlAlias : IContentFinder
     {
 		/// <summary>
 		/// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ContentFinderResolver.cs b/src/Umbraco.Web/Routing/ContentFinderResolver.cs
index e2962be817..78dcbda899 100644
--- a/src/Umbraco.Web/Routing/ContentFinderResolver.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderResolver.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
     /// Resolves IPublishedContentFinder objects.
 	/// </summary>
-	internal sealed class ContentFinderResolver : ManyObjectsResolverBase<ContentFinderResolver, IContentFinder>
+	public sealed class ContentFinderResolver : ManyObjectsResolverBase<ContentFinderResolver, IContentFinder>
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ContentFinderResolver"/> class with an initial list of finder types.
diff --git a/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs b/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs
index a0c386297c..7e1faf6daf 100644
--- a/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs
+++ b/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
     /// Resolves the last chance IPublishedContentFinder object.
 	/// </summary>
-	internal sealed class ContentLastChanceFinderResolver : SingleObjectResolverBase<ContentLastChanceFinderResolver, IContentFinder>
+	public sealed class ContentLastChanceFinderResolver : SingleObjectResolverBase<ContentLastChanceFinderResolver, IContentFinder>
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ContentLastChanceFinderResolver"/> class with no finder.
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index b6ff0f33bc..a2285ddc74 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides urls.
     /// </summary>
-    internal class DefaultUrlProvider : IUrlProvider
+    public class DefaultUrlProvider : IUrlProvider
     {
         #region GetUrl
 
diff --git a/src/Umbraco.Web/Routing/DomainAndUri.cs b/src/Umbraco.Web/Routing/DomainAndUri.cs
index db7eecf5af..ba13508812 100644
--- a/src/Umbraco.Web/Routing/DomainAndUri.cs
+++ b/src/Umbraco.Web/Routing/DomainAndUri.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Routing
     /// <para>In Umbraco it is valid to create domains with name such as <c>example.com</c>, <c>https://www.example.com</c>, <c>example.com/foo/</c>.</para>
     /// <para>The normalized uri of a domain begins with a scheme and ends with no slash, eg <c>http://example.com/</c>, <c>https://www.example.com/</c>, <c>http://example.com/foo/</c>.</para>
     /// </remarks>
-    internal class DomainAndUri
+    public class DomainAndUri
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DomainAndUri"/> class with a Domain and a uri scheme.
diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index 2aefcdb8fb..85a1c5f66f 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides utilities to handle domains.
     /// </summary>
-	internal class DomainHelper
+	public class DomainHelper
 	{
         #region Temp. abstract Umbraco's API
 
@@ -272,7 +272,7 @@ namespace Umbraco.Web.Routing
         /// <param name="path">The full path of the uri.</param>
         /// <returns>The path part relative to the uri of the domain.</returns>
         /// <remarks>Eg the relative part of <c>/foo/bar/nil</c> to domain <c>example.com/foo</c> is <c>/bar/nil</c>.</remarks>
-        internal static string PathRelativeToDomain(Uri domainUri, string path)
+        public static string PathRelativeToDomain(Uri domainUri, string path)
         {
             return path.Substring(domainUri.AbsolutePath.Length).EnsureStartsWith('/');
         }
diff --git a/src/Umbraco.Web/Routing/IContentFinder.cs b/src/Umbraco.Web/Routing/IContentFinder.cs
index c71ddd0c34..c29df43465 100644
--- a/src/Umbraco.Web/Routing/IContentFinder.cs
+++ b/src/Umbraco.Web/Routing/IContentFinder.cs
@@ -3,7 +3,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
 	/// Provides a method to try to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
 	/// </summary>
-	internal interface IContentFinder
+	public interface IContentFinder
     {
 	    /// <summary>
 	    /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
diff --git a/src/Umbraco.Web/Routing/ISiteDomainHelper.cs b/src/Umbraco.Web/Routing/ISiteDomainHelper.cs
index b290c9b1c1..482cbba4a9 100644
--- a/src/Umbraco.Web/Routing/ISiteDomainHelper.cs
+++ b/src/Umbraco.Web/Routing/ISiteDomainHelper.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides utilities to handle site domains.
     /// </summary>
-    internal interface ISiteDomainHelper
+    public interface ISiteDomainHelper
     {
         /// <summary>
         /// Filters a list of <c>DomainAndUri</c> to pick one that best matches the current request.
diff --git a/src/Umbraco.Web/Routing/IUrlProvider.cs b/src/Umbraco.Web/Routing/IUrlProvider.cs
index b8abeadd54..79b27f888a 100644
--- a/src/Umbraco.Web/Routing/IUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/IUrlProvider.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides urls.
     /// </summary>
-    internal interface IUrlProvider
+    public interface IUrlProvider
     {
         /// <summary>
         /// Gets the nice url of a published content.
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index 947fbf37aa..5698b36b1c 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Routing
 	/// Represents a request for one specified Umbraco IPublishedContent to be rendered
 	/// by one specified template, using one specified Culture and RenderingEngine.
 	/// </summary>
-	internal class PublishedContentRequest
+	public class PublishedContentRequest
     {
 		/// <summary>
 		/// Triggers once the published content request has been prepared, but before it is processed.
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Routing
 		/// </summary>
 		/// <param name="uri">The request <c>Uri</c>.</param>
 		/// <param name="routingContext">A routing context.</param>
-		public PublishedContentRequest(Uri uri, RoutingContext routingContext)
+		internal PublishedContentRequest(Uri uri, RoutingContext routingContext)
 		{
 			if (uri == null) throw new ArgumentNullException("uri");
 			if (routingContext == null) throw new ArgumentNullException("routingContext");
diff --git a/src/Umbraco.Web/Routing/RoutingContext.cs b/src/Umbraco.Web/Routing/RoutingContext.cs
index d332d499eb..bb52a43193 100644
--- a/src/Umbraco.Web/Routing/RoutingContext.cs
+++ b/src/Umbraco.Web/Routing/RoutingContext.cs
@@ -46,6 +46,6 @@ namespace Umbraco.Web.Routing
 		/// <summary>
 		/// Gets the urls provider.
 		/// </summary>
-		internal UrlProvider UrlProvider { get; private set; }
+		public UrlProvider UrlProvider { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Routing/SiteDomainHelper.cs b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
index ea035fa061..d56bd5844b 100644
--- a/src/Umbraco.Web/Routing/SiteDomainHelper.cs
+++ b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Routing
  	/// <summary>
 	/// Provides utilities to handle site domains.
  	/// </summary>
-	internal class SiteDomainHelper : ISiteDomainHelper
+	public class SiteDomainHelper : ISiteDomainHelper
  	{
         #region Configure
  
diff --git a/src/Umbraco.Web/Routing/SiteDomainHelperResolver.cs b/src/Umbraco.Web/Routing/SiteDomainHelperResolver.cs
index 9cb101b6b1..daf1d932d8 100644
--- a/src/Umbraco.Web/Routing/SiteDomainHelperResolver.cs
+++ b/src/Umbraco.Web/Routing/SiteDomainHelperResolver.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
 	/// Resolves the <see cref="ISiteDomainHelper"/> implementation.
 	/// </summary>
-	internal sealed class SiteDomainHelperResolver : SingleObjectResolverBase<SiteDomainHelperResolver, ISiteDomainHelper>
+	public sealed class SiteDomainHelperResolver : SingleObjectResolverBase<SiteDomainHelperResolver, ISiteDomainHelper>
 	{
 		
 		/// <summary>
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index 6746d55f72..62d4142ec6 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides urls.
     /// </summary>
-    internal class UrlProvider
+    public class UrlProvider
     {
         #region Ctor and configuration
 
@@ -18,7 +18,7 @@ namespace Umbraco.Web.Routing
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="urlProviders">The list of url providers.</param>
-        public UrlProvider(UmbracoContext umbracoContext, IEnumerable<IUrlProvider> urlProviders)
+        internal UrlProvider(UmbracoContext umbracoContext, IEnumerable<IUrlProvider> urlProviders)
         {
             _umbracoContext = umbracoContext;
             _urlProviders = urlProviders;
diff --git a/src/Umbraco.Web/Routing/UrlProviderMode.cs b/src/Umbraco.Web/Routing/UrlProviderMode.cs
index 8a26eac0c2..9ca1b9f32a 100644
--- a/src/Umbraco.Web/Routing/UrlProviderMode.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderMode.cs
@@ -10,7 +10,7 @@
     /// the true, pre-4.10, always-relative behavior of Umbraco.</para>
     /// <para>For the time being, the default option is <c>AutoLegacy</c> although in the future it will be <c>Auto</c>.</para>
     /// </remarks>
-    internal enum UrlProviderMode
+    public enum UrlProviderMode
     {
         /// <summary>
         /// Indicates that the url provider should determine automatically whether to return relative or absolute urls,
diff --git a/src/Umbraco.Web/Routing/UrlProviderResolver.cs b/src/Umbraco.Web/Routing/UrlProviderResolver.cs
index bdbcf96c55..0cd0346cd9 100644
--- a/src/Umbraco.Web/Routing/UrlProviderResolver.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderResolver.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Resolves IUrlProvider objects.
     /// </summary>
-    internal sealed class UrlProviderResolver : ManyObjectsResolverBase<UrlProviderResolver, IUrlProvider>
+    public sealed class UrlProviderResolver : ManyObjectsResolverBase<UrlProviderResolver, IUrlProvider>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UrlProviderResolver"/> class with an initial list of provider types.
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 5fd1f249da..7bc3cee4ae 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -223,12 +223,12 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets or sets the published content cache.
         /// </summary>
-        internal ContextualPublishedContentCache ContentCache { get; private set; }
+        public ContextualPublishedContentCache ContentCache { get; private set; }
 
         /// <summary>
         /// Gets or sets the published media cache.
         /// </summary>
-        internal ContextualPublishedMediaCache MediaCache { get; private set; }
+        public ContextualPublishedMediaCache MediaCache { get; private set; }
 
 		/// <summary>
 		/// Boolean value indicating whether the current request is a front-end umbraco request