diff --git a/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
index 460bed71d3..57d3871e5a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IDataTypeContainerRepository : IEntityContainerRepository
+    public interface IDataTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
index ccf8df268d..ec8dfb9110 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IDocumentTypeContainerRepository : IEntityContainerRepository
+    public interface IDocumentTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
index 47f0cee52b..f1c8353a0d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
@@ -2,6 +2,6 @@
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IEntityContainerRepository : IReadRepository<int, EntityContainer>, IWriteRepository<EntityContainer>
+    public interface IEntityContainerRepository : IReadRepository<int, EntityContainer>, IWriteRepository<EntityContainer>
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
index eefb48933e..1ed08352ed 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal interface IMacroRepository : IReadWriteQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
+    public interface IMacroRepository : IReadWriteQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
     {
 
         //IEnumerable<IMacro> GetAll(params string[] aliases);
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
index a1872df0cd..6a133c053a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IMediaTypeContainerRepository : IEntityContainerRepository
+    public interface IMediaTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
index d67f8f9200..57e1d288e4 100644
--- a/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
+++ b/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services.Changes
 {
-    internal class ContentTypeChange<TItem>
+    public class ContentTypeChange<TItem>
         where TItem : class, IContentTypeComposition
     {
         public ContentTypeChange(TItem item, ContentTypeChangeTypes changeTypes)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
index f6498770ec..fa818496ff 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the ContentType Service, which is an easy access to operations involving <see cref="IContentType"/>
     /// </summary>
-    internal class ContentTypeService : ContentTypeServiceBase<IContentTypeRepository, IContentType, IContentTypeService>, IContentTypeService
+    public class ContentTypeService : ContentTypeServiceBase<IContentTypeRepository, IContentType, IContentTypeService>, IContentTypeService
     {
         public ContentTypeService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IContentService contentService,
             IContentTypeRepository repository, IAuditRepository auditRepository, IDocumentTypeContainerRepository entityContainerRepository, IEntityRepository entityRepository)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
index d5cdd36318..26298f171c 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase : ScopeRepositoryService
+    public abstract class ContentTypeServiceBase : ScopeRepositoryService
     {
         protected ContentTypeServiceBase(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory)
             : base(provider, logger, eventMessagesFactory)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
index 33fb9a0894..f4457e0991 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Services.Changes;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase<TItem, TService> : ContentTypeServiceBase
+    public abstract class ContentTypeServiceBase<TItem, TService> : ContentTypeServiceBase
         where TItem : class, IContentTypeComposition
         where TService : class, IContentTypeServiceBase<TItem>
     {
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index be4f719bb1..8189c6524e 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -13,7 +13,7 @@ using Umbraco.Core.Services.Changes;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeServiceBase<TItem>
+    public abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeServiceBase<TItem>
         where TRepository : IContentTypeRepositoryBase<TItem>
         where TItem : class, IContentTypeComposition
         where TService : class, IContentTypeServiceBase<TItem>
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 79ca851de9..84d44649da 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the DataType Service, which is an easy access to operations involving <see cref="IDataType"/>
     /// </summary>
-    internal class DataTypeService : ScopeRepositoryService, IDataTypeService
+    public class DataTypeService : ScopeRepositoryService, IDataTypeService
     {
         private readonly IDataTypeRepository _dataTypeRepository;
         private readonly IDataTypeContainerRepository _dataTypeContainerRepository;
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 1a1d2e5ab2..fd1067b3e5 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Services.Implement
         private readonly IDataTypeService _dataTypeService;
         private readonly IUserService _userService;
         private readonly ILocalizationService _localizationService;
-        private readonly IEnumerable<IUrlSegmentProvider> _urlSegmentProviders;
+        private readonly UrlSegmentProviderCollection _urlSegmentProviders;
 
         public EntityXmlSerializer(
             IContentService contentService,
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Services.Implement
             IUserService userService,
             ILocalizationService localizationService,
             IContentTypeService contentTypeService,
-            IEnumerable<IUrlSegmentProvider> urlSegmentProviders)
+            UrlSegmentProviderCollection urlSegmentProviders)
         {
             _contentTypeService = contentTypeService;
             _mediaService = mediaService;
diff --git a/src/Umbraco.Core/Services/Implement/MacroService.cs b/src/Umbraco.Core/Services/Implement/MacroService.cs
index 5176e2eb22..d4f2d95bbb 100644
--- a/src/Umbraco.Core/Services/Implement/MacroService.cs
+++ b/src/Umbraco.Core/Services/Implement/MacroService.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the Macro Service, which is an easy access to operations involving <see cref="IMacro"/>
     /// </summary>
-    internal class MacroService : ScopeRepositoryService, IMacroService
+    public class MacroService : ScopeRepositoryService, IMacroService
     {
         private readonly IMacroRepository _macroRepository;
         private readonly IAuditRepository _auditRepository;
diff --git a/src/Umbraco.Core/Services/Implement/MediaTypeService.cs b/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
index fe8c78e137..8cb69a655d 100644
--- a/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal class MediaTypeService : ContentTypeServiceBase<IMediaTypeRepository, IMediaType, IMediaTypeService>, IMediaTypeService
+    public class MediaTypeService : ContentTypeServiceBase<IMediaTypeRepository, IMediaType, IMediaTypeService>, IMediaTypeService
     {
         public MediaTypeService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMediaService mediaService,
             IMediaTypeRepository mediaTypeRepository, IAuditRepository auditRepository, IMediaTypeContainerRepository entityContainerRepository,
diff --git a/src/Umbraco.Core/Services/Implement/MemberTypeService.cs b/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
index 6cc7d03cfb..05f32dc99c 100644
--- a/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal class MemberTypeService : ContentTypeServiceBase<IMemberTypeRepository, IMemberType, IMemberTypeService>, IMemberTypeService
+    public class MemberTypeService : ContentTypeServiceBase<IMemberTypeRepository, IMemberType, IMemberTypeService>, IMemberTypeService
     {
         private readonly IMemberTypeRepository _memberTypeRepository;
 
diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index d8e698cdad..a6262c53fc 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -13,11 +13,11 @@ namespace Umbraco.Examine
     /// </summary>
     public class ContentValueSetBuilder : BaseValueSetBuilder<IContent>, IContentValueSetBuilder, IPublishedContentValueSetBuilder
     {
-        private readonly IEnumerable<IUrlSegmentProvider> _urlSegmentProviders;
+        private readonly UrlSegmentProviderCollection _urlSegmentProviders;
         private readonly IUserService _userService;
 
         public ContentValueSetBuilder(PropertyEditorCollection propertyEditors,
-            IEnumerable<IUrlSegmentProvider> urlSegmentProviders,
+            UrlSegmentProviderCollection urlSegmentProviders,
             IUserService userService,
             bool publishedValuesOnly)
             : base(propertyEditors, publishedValuesOnly)
diff --git a/src/Umbraco.Examine/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
index 2676093eeb..23d0414d5d 100644
--- a/src/Umbraco.Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MediaValueSetBuilder.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Examine
 {
     public class MediaValueSetBuilder : BaseValueSetBuilder<IMedia>
     {
-        private readonly IEnumerable<IUrlSegmentProvider> _urlSegmentProviders;
+        private readonly UrlSegmentProviderCollection _urlSegmentProviders;
         private readonly IUserService _userService;
 
         public MediaValueSetBuilder(PropertyEditorCollection propertyEditors,
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 0b36398dd6..3019138809 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.UmbracoExamine
     {
         public static ContentValueSetBuilder GetContentValueSetBuilder(PropertyEditorCollection propertyEditors, bool publishedValuesOnly)
         {
-            var contentValueSetBuilder = new ContentValueSetBuilder(propertyEditors, new[] { new DefaultUrlSegmentProvider() }, GetMockUserService(), publishedValuesOnly);
+            var contentValueSetBuilder = new ContentValueSetBuilder(propertyEditors, new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }), GetMockUserService(), publishedValuesOnly);
             return contentValueSetBuilder;
         }
 
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 860d3ec88e..1e8f3d17f7 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -159,41 +159,6 @@ namespace Umbraco.Web.Composing
 
         #endregion
 
-        #region Web Actions
-
-        internal static void RestartAppPool()
-        {
-            // see notes in overload
-
-            var httpContext = HttpContext.Current;
-            if (httpContext != null)
-            {
-                httpContext.Application.Add("AppPoolRestarting", true);
-                httpContext.User = null;
-            }
-            Thread.CurrentPrincipal = null;
-            HttpRuntime.UnloadAppDomain();
-        }
-
-        internal static void RestartAppPool(HttpContextBase httpContext)
-        {
-            // we're going to put an application wide flag to show that the application is about to restart.
-            // we're doing this because if there is a script checking if the app pool is fully restarted, then
-            // it can check if this flag exists...  if it does it means the app pool isn't restarted yet.
-            httpContext.Application.Add("AppPoolRestarting", true);
-
-            // unload app domain - we must null out all identities otherwise we get serialization errors
-            // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
-            httpContext.User = null;
-            if (HttpContext.Current != null)
-                HttpContext.Current.User = null;
-            Thread.CurrentPrincipal = null;
-
-            HttpRuntime.UnloadAppDomain();
-        }
-
-        #endregion
-
         #region Core Getters
 
         // proxy Core for convenience
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index f72c876a61..d33b1addf5 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Components
         /// Gets the url providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
-        internal static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
+        public static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
             => composition.WithCollectionBuilder<UrlProviderCollectionBuilder>();
 
         #endregion
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index f87f323df8..b66e7dac2f 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -315,7 +315,7 @@ namespace Umbraco.Web.Editors
             var installedFiles = Services.PackagingService.InstallCompiledPackageFiles(definition, zipFile, Security.GetUserId().ResultOr(0));
 
             //set a restarting marker and reset the app pool
-            Current.RestartAppPool(Request.TryGetHttpContext().Result);
+            UmbracoApplication.Restart(Request.TryGetHttpContext().Result);
 
             model.IsRestarting = true;
 
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
index 0349bb4ec7..641146fb4a 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
             var (packageFile, packageId) = await DownloadPackageFilesAsync(starterKitId.Value);
 
-            Current.RestartAppPool();
+            UmbracoApplication.Restart();
 
             return new InstallSetupResult(new Dictionary<string, object>
             {
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
index 805041391f..8bd699f293 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
             InstallBusinessLogic(packageId);
 
-            Current.RestartAppPool(_httContext);
+            UmbracoApplication.Restart(_httContext);
 
             return Task.FromResult<InstallSetupResult>(null);
         }
diff --git a/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs b/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
index 70672e3796..0007b346c5 100644
--- a/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
+++ b/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.PublishedContent
         /// <inheritdoc />
         public VariationContext VariationContext
         {
-            get => (VariationContext) HttpContextAccessor.HttpContext.Items[ContextKey];
+            get => (VariationContext) HttpContextAccessor.HttpContext?.Items[ContextKey];
             set => HttpContextAccessor.HttpContext.Items[ContextKey] = value;
         }
     }
diff --git a/src/Umbraco.Web/Mvc/ContentModelBinder.cs b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
index b68d5a36f7..c6df52e007 100644
--- a/src/Umbraco.Web/Mvc/ContentModelBinder.cs
+++ b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
@@ -150,7 +150,7 @@ namespace Umbraco.Web.Mvc
                 if (context == null)
                     AppDomain.Unload(AppDomain.CurrentDomain);
                 else
-                    Current.RestartAppPool(new HttpContextWrapper(context));
+                    UmbracoApplication.Restart(new HttpContextWrapper(context));
             }
 
             throw new ModelBindingException(msg.ToString());
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index dc8fcf8c0e..36f3472c31 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -101,6 +101,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
+
+            // we need an Xml serializer here so that the member cache can support XPath,
+            // for members this is done by navigating the serialized-to-xml member
             _entitySerializer = entitySerializer;
 
             // we always want to handle repository events, configured or not
diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs
index 8ee2caedee..7aab3cfd8f 100644
--- a/src/Umbraco.Web/Search/ExamineComposer.cs
+++ b/src/Umbraco.Web/Search/ExamineComposer.cs
@@ -33,13 +33,13 @@ namespace Umbraco.Web.Search
             composition.RegisterUnique<IPublishedContentValueSetBuilder>(factory =>
                 new ContentValueSetBuilder(
                     factory.GetInstance<PropertyEditorCollection>(),
-                    factory.GetInstance<IEnumerable<IUrlSegmentProvider>>(),
+                    factory.GetInstance<UrlSegmentProviderCollection>(),
                     factory.GetInstance<IUserService>(),
                     true));
             composition.RegisterUnique<IContentValueSetBuilder>(factory =>
                 new ContentValueSetBuilder(
                     factory.GetInstance<PropertyEditorCollection>(),
-                    factory.GetInstance<IEnumerable<IUrlSegmentProvider>>(),
+                    factory.GetInstance<UrlSegmentProviderCollection>(),
                     factory.GetInstance<IUserService>(),
                     false));
             composition.RegisterUnique<IValueSetBuilder<IMedia>, MediaValueSetBuilder>();
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 136f09f83d..191fb9dcd6 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -1,4 +1,6 @@
-using Umbraco.Core;
+using System.Threading;
+using System.Web;
+using Umbraco.Core;
 using Umbraco.Web.Runtime;
 
 namespace Umbraco.Web
@@ -12,5 +14,46 @@ namespace Umbraco.Web
         {
             return new WebRuntime(this);
         }
+
+        /// <summary>
+        /// Restarts the Umbraco application.
+        /// </summary>
+        public static void Restart()
+        {
+            // see notes in overload
+
+            var httpContext = HttpContext.Current;
+            if (httpContext != null)
+            {
+                httpContext.Application.Add("AppPoolRestarting", true);
+                httpContext.User = null;
+            }
+            Thread.CurrentPrincipal = null;
+            HttpRuntime.UnloadAppDomain();
+        }
+
+        /// <summary>
+        /// Restarts the Umbraco application.
+        /// </summary>
+        public static void Restart(HttpContextBase httpContext)
+        {
+            if (httpContext != null)
+            {
+                // we're going to put an application wide flag to show that the application is about to restart.
+                // we're doing this because if there is a script checking if the app pool is fully restarted, then
+                // it can check if this flag exists...  if it does it means the app pool isn't restarted yet.
+                httpContext.Application.Add("AppPoolRestarting", true);
+
+                // unload app domain - we must null out all identities otherwise we get serialization errors
+                // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
+                httpContext.User = null;
+            }
+
+            if (HttpContext.Current != null)
+                HttpContext.Current.User = null;
+
+            Thread.CurrentPrincipal = null;
+            HttpRuntime.UnloadAppDomain();
+        }
     }
 }