diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index bd9129c8b6..18deba3b0a 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -180,15 +180,7 @@ namespace Umbraco.Core
         {
             Resolution.Freeze();
         }
-
-        /// <summary>
-        /// Freeze resolution to not allow Resolvers to be modified
-        /// </summary>
-        protected virtual void FreezeResolution()
-        {
-            Resolution.Freeze();
-        }
-
+        
 		/// <summary>
 		/// Create the resolvers
 		/// </summary>
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index fd3aa65fba..0e5ae7f1d5 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Web
             if (UmbracoContext.Current != null && !replaceContext)
                 return UmbracoContext.Current;
 
-            var umbracoContext = new UmbracoContext(httpContext, applicationContext, RoutesCacheResolver.Current.RoutesCache);
+            var umbracoContext = new UmbracoContext(httpContext, applicationContext);
 
             // create the nice urls provider
             var niceUrls = new NiceUrlProvider(PublishedContentStoreResolver.Current.PublishedContentStore, umbracoContext);
@@ -89,10 +89,11 @@ namespace Umbraco.Web
             // create the RoutingContext, and assign
             var routingContext = new RoutingContext(
                 umbracoContext,
-                DocumentLookupsResolver.Current.DocumentLookups,
-                LastChanceLookupResolver.Current.LastChanceLookup,
+                ContentFinderResolver.Current.Finders,
+                ContentLastChanceFinderResolver.Current.Finder,
                 PublishedContentStoreResolver.Current.PublishedContentStore,
-                niceUrls);
+                niceUrls,
+                RoutesCacheResolver.Current.RoutesCache);
 
             //assign the routing context back
             umbracoContext.RoutingContext = routingContext;
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index e963070ded..412298493a 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -93,19 +93,6 @@ namespace Umbraco.Web
             UmbracoContext.EnsureContext(new HttpContextWrapper(UmbracoApplication.Context), ApplicationContext);
         }
 
-        /// <summary>
-        /// Override this method in order to ensure that the UmbracoContext is also created, this can only be 
-        /// created after resolution is frozen!
-        /// </summary>
-        protected override void FreezeResolution()
-        {
-            base.FreezeResolution();
-
-            //before we do anything, we'll ensure the umbraco context
-            //see: http://issues.umbraco.org/issue/U4-1717
-            UmbracoContext.EnsureContext(new HttpContextWrapper(UmbracoApplication.Context), ApplicationContext);
-        }
-
         /// <summary>
         /// Adds custom types to the ApplicationEventsResolver
         /// </summary>