Changed test to use to use 0.5.0.0 version

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
Merge branch 'netcore/alpha002' into netcore/netcore
2020-09-23 19:46:53 +02:00 · 2020-09-23 18:25:22 +02:00 · 2020-09-23 18:24:31 +02:00 · 2020-09-23 17:23:01 +02:00 · 2020-09-23 17:22:06 +02:00 · 2020-09-23 14:50:49 +02:00
4374 changed files with 91697 additions and 81841 deletions
@@ -1,43 +1,44 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Default settings:
-# A newline ending every file
-# Use 4 spaces as indentation
-[*]
-insert_final_newline = true
-end_of_line = crlf
-indent_style = space
-indent_size = 4
-
-# Trim trailing whitespace, limited support.
-# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
-trim_trailing_whitespace = true
-
-[*.{cs,vb}]
-dotnet_style_predefined_type_for_locals_parameters_members = true:error
-
-dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
-dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
-dotnet_naming_rule.private_members_with_underscore.severity = suggestion
-
-dotnet_naming_symbols.private_fields.applicable_kinds           = field
-dotnet_naming_symbols.private_fields.applicable_accessibilities = private
-
-dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
-
-# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
-[*.cs]
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-csharp_prefer_braces = false : none
-
-[*.js]
-trim_trailing_whitespace = true
-
-[*.less]
-trim_trailing_whitespace = false
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+end_of_line = crlf
+indent_style = space
+indent_size = 4
+
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true
+
+[*.{cs,vb}]
+dotnet_style_predefined_type_for_locals_parameters_members = true:error
+
+dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
+dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
+dotnet_naming_rule.private_members_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_fields.applicable_kinds           = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private
+# dotnet_naming_symbols.private_fields.required_modifiers = abstract,async,readonly,static # all except const
+
+dotnet_naming_style.prefix_underscore.capitalization = camel_case
+dotnet_naming_style.prefix_underscore.required_prefix = _
+
+# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
+[*.cs]
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_prefer_braces = false : none
+
+[*.js]
+trim_trailing_whitespace = true
+
+[*.less]
+trim_trailing_whitespace = false
@@ -123,7 +123,7 @@ You can get in touch with [the core contributors team](#the-core-contributors-te

 In order to build the Umbraco source code locally, first make sure you have the following installed.

-  * [Visual Studio 2017 v15.9.7+](https://visualstudio.microsoft.com/vs/)
+  * [Visual Studio 2019 v16.3+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/)
  * [Node.js v10+](https://nodejs.org/en/download/)
  * npm v6.4.1+ (installed with Node.js)
  * [Git command line](https://git-scm.com/download/)
@@ -0,0 +1,65 @@
+---
+name: 🌟 .Net Core Bug Report 
+about: For bugs specifically for the upcoming .NET Core release of Umbraco, don't use this if you're working with Umbraco version 7 or 8
+labels: project/net-core
+---
+
+ℹ️ If this bug **also** appears on the current version 8 of Umbraco then please [report it as a regular bug](https://github.com/umbraco/Umbraco-CMS/issues/new?template=1_Bug.md), fixes in version 8 will be merged to the .NET Core version.
+
+A brief description of the issue goes here.
+
+<!--
+
+Please fill out the rest of the details in the issue template below. 
+The more details you can give us, the easier it will be for us
+to determine the cause of a problem.
+
+-->
+
+
+Reproduction
+------------
+
+If you're filing a bug, please describe how to reproduce it. Include as much
+relevant information as possible, such as:
+
+### Bug summary
+
+<!--
+    * Write a short summary of the bug
+    * Try to pinpoint it as much as possible
+    * Try to state the _actual problem_, and not just what you _think_ the
+      solution might be.
+-->
+
+### Specifics
+
+<!--
+    * Mention the URL where this bug occurs, if applicable
+    * What version of Umbraco are you using (down to the very last digit!)
+    * What browser and version you are using
+    * Please mention if you've checked it in other browsers as well
+    * Please include *full error messages* and *screenshots* if possible
+-->
+
+### Steps to reproduce
+
+<!--
+    * Clearly mention the steps to reproduce the bug
+-->
+
+### Expected result
+
+<!--
+    * What did you _expect_ that would happen on your Umbraco site?
+    * Describe the intended/desired outcome after you did the steps mentioned.
+-->
+
+### Actual result
+
+<!--
+    * What is the actual result of the above steps?
+    * Describe the behaviour of the bug
+    * Please, please include **error messages** and screenshots. They might mean
+      nothing to you, but they are _very_ helpful to us.
+-->
@@ -37,4 +37,3 @@ Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://
 ## Contributing

 Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
-
@@ -163,14 +163,29 @@ build/hooks/
 build/temp/


-
-# eof
-/src/Umbraco.Web.UI.Client/TESTS-*.xml
-/src/ApiDocs/api/*
-
 # Acceptance tests
 cypress.env.json
 /src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
 /src/Umbraco.Tests.AcceptanceTest/package-lock.json
 /src/Umbraco.Tests.AcceptanceTest/cypress/videos/
 /src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
+
+
+# eof
+/src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/ApiDocs/api/*
+/src/Umbraco.Web.UI.Client/package-lock.json
+/src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
+/src/Umbraco.Tests.Integration/App_Data/*
+/src/Umbraco.Tests.Integration/TEMP/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/assets/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/js/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/lib/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/views/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/*
+/src/Umbraco.Web.UI.NetCore/App_Data/Logs/*
+/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/*
+/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/*
+/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/*
+/src/Umbraco.Web.UI.NetCore/umbraco/logs
@@ -7,5 +7,6 @@
  -->
  <packageSources>
    <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
+    <add key="ExamineAzurePipelines" value="https://shazwazza.pkgs.visualstudio.com/Examine/_packaging/Examine-Beta/nuget/v3/index.json" />
  </packageSources>
 </configuration>
@@ -1,61 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Core</id>
-        <version>8.0.0</version>
+        <id>Umbraco.Cms.Core</id>
+        <version>9.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Umbraco HQ</authors>
        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.</description>
        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>

-            <group targetFramework="net472">
+            <group targetFramework="netstandard2.0">
                <!--
                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
-                <dependency id="LightInject" version="[5.4.0,5.999999)" />
+                <dependency id="Microsoft.Extensions.Configuration" version="[3.1.8,3.999999)" />
+                <dependency id="Microsoft.Extensions.Configuration.Binder" version="[3.1.8,3.999999)" />
+                <dependency id="Microsoft.Extensions.Configuration.Json" version="[3.1.8,3.999999)" />
+                <dependency id="System.Configuration.ConfigurationManager" version="[4.7.0,4.999999)" />
+                <dependency id="System.ComponentModel.Annotations" version="[4.7.0,4.999999)" />
+                <dependency id="System.Reflection.Emit.Lightweight" version="[4.7.0,4.999999)" />
+                <dependency id="System.Runtime.Caching" version="[4.7.0,4.999999)" />
+                <dependency id="HtmlAgilityPack" version="[1.11.24,1.999999)" />
+                <dependency id="LightInject" version="[6.3.4,6.999999)" />
                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,2.999999)" />
+                <dependency id="LightInject.Microsoft.DependencyInjection" version="[3.3.1,3.999999)" />
+                <dependency id="LightInject.Microsoft.Hosting" version="[1.2.1,1.999999)" />
+                <dependency id="MailKit" version="[2.9.0,2.999999)" />
+                <dependency id="Markdown" version="[2.2.1,2.999999)" />
+                <dependency id="Microsoft.CSharp" version="[4.7.0,4.999999)" />
+                <dependency id="Microsoft.Extensions.DependencyInjection" version="[3.1.8,3.999999)" />
+                <dependency id="Microsoft.Extensions.Configuration.Abstractions" version="[3.1.8,3.999999)" />
+                <dependency id="Microsoft.Extensions.Identity.Stores" version="[3.1.8,3.999999)" />
+                <dependency id="MiniProfiler.Shared" version="[4.2.1,4.999999)" />
+                <dependency id="Newtonsoft.Json" version="[12.0.3,12.999999)" />
+                <dependency id="NPoco" version="[4.0.2,4.999999)" />
+                <dependency id="Serilog" version="[2.10.0,2.999999)" />
                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
+                <dependency id="Serilog.Enrichers.Thread" version="[3.1.0,3.999999)" />
+                <dependency id="Serilog.Extensions.Hosting" version="[3.1.0,3.999999)" />
+                <dependency id="Serilog.Filters.Expressions" version="[2.1.0,2.999999)" />
+                <dependency id="Serilog.Formatting.Compact" version="[1.1.0,1.999999)" />
                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
-                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[3.9.4,3.999999)" />
+                <dependency id="Serilog.Sinks.Async" version="[1.4.0,1.999999)" />
+                <dependency id="Serilog.Sinks.File" version="[4.1.0,4.999999)" />
+                <dependency id="Serilog.Sinks.Map" version="[1.0.1,1.999999)" />
+                <dependency id="System.Data.SqlClient" version="[4.8.2,4.999999)" />
+                <dependency id="System.Drawing.Common" version="[4.7.0,4.999999)" />
+                <dependency id="System.IO.FileSystem.AccessControl" version="[4.7.0,4.999999)" />
+                <dependency id="System.Threading.Tasks.Dataflow" version="[4.11.1,4.999999)" />
+                <dependency id="Examine.Core" version="[2.0.0-alpha.20200128.15,2.999999)" />
+                <dependency id="CSharpTest.Net.Collections-NetStd2" version="[14.906.1403.1084,14.999999)" />
+                <dependency id="SecurityCodeScan" version="[3.4.0,3.999999)" />
            </group>

        </dependencies>
    </metadata>
    <files>
+        <!-- Umbraco.Examine.Lucene HACK remove this when Examine lucene is a real netstandard dependency -->
+        <file src="$BuildTmp$\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
+
        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />

        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net472\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.xml" target="lib\netstandard2.0\Umbraco.Infrastructure.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.xml" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.xml" />

        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\net472\Umbraco.Core.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\netstandard2.0\Umbraco.Core.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.pdb" target="lib\netstandard2.0\Umbraco.Infrastructure.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.pdb" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.pdb" />
    </files>
 </package>
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Cms.SqlCe</id>
+        <version>9.0.0</version>
+        <title>Umbraco Cms Sql Ce Add-on</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the SQL CE assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.</description>
+        <summary>Contains the SQL CE assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <dependencies>
+
+            <group targetFramework="netstandard2.0">
+                <!--
+                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+                  not want this to happen as the alpha of the next major is, really, the next major already.
+                -->
+                <dependency id="Umbraco.Cms.Core" version="[$version$]" />
+                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" /> <!-- Hack it is only available in framework, but we need it on netstandard -->
+            </group>
+
+        </dependencies>
+    </metadata>
+    <files>
+        <!-- libs -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistance.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.dll" />
+        <file src="$BuildTmp$\SqlCe\System.Data.SqlServerCe.dll" target="lib\netstandard2.0\System.Data.SqlServerCe.dll" /> <!-- Hack because the file from the package is only added to net472 projects -->
+
+        <!-- docs -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
+
+        <!-- symbols -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistance.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.pdb" />
+    </files>
+</package>
@@ -1,68 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Web</id>
-        <version>8.0.0</version>
+        <id>Umbraco.Cms.Web</id>
+        <version>9.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Umbraco HQ</authors>
        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.</description>
        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>

-            <group targetFramework="net472">
-
+            <group targetFramework="netcoreapp3.1">
                <!--
                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
-                <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.9,1.999999)" />
-                <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
-                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.2,1.999999)" />
-                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
-                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-                <dependency id="Markdown" version="[2.2.1,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-
+                <dependency id="Umbraco.Cms.Core" version="[$version$]" />
+                <dependency id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" version="[3.1.8,3.999999)" />
+                <dependency id="Serilog.AspNetCore" version="[3.4.0,3.999999)" />
+                <dependency id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" version="[3.1.8,3.999999)" />
+                <dependency id="Microsoft.CodeAnalysis.CSharp" version="[3.7.0,3.999999)" />
+                <dependency id="MiniProfiler.AspNetCore.Mvc" version="[4.2.1,4.999999)" />
+                <dependency id="NETStandard.Library" version="[2.0.3,2.999999)" />
+                <dependency id="Smidge" version="[3.1.1,3.999999)" />
+                <dependency id="Smidge.Nuglify" version="[2.0.0,2.999999)" />
+                <dependency id="SixLabors.ImageSharp.Web" version="[1.0.0,1.999999)" />
+                <dependency id="HtmlSanitizer" version="[5.0.343,5.999999)" />
            </group>

        </dependencies>
    </metadata>
    <files>
        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\net472\Umbraco.ModelsBuilder.Embedded.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.dll" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.dll" target="lib\netcoreapp3.1\Umbraco.Web.Common.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.dll" target="lib\netcoreapp3.1\Umbraco.Web.Website.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\netcoreapp3.1\Umbraco.ModelsBuilder.Embedded.dll" />

        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\net472\Umbraco.ModelsBuilder.Embedded.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.xml" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.xml" target="lib\netcoreapp3.1\Umbraco.Web.Common.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.xml" target="lib\netcoreapp3.1\Umbraco.Web.Website.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\netcoreapp3.1\Umbraco.ModelsBuilder.Embedded.xml" />

        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\net472\Umbraco.ModelsBuilder.Embedded.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.pdb" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Common.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Website.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\netcoreapp3.1\Umbraco.ModelsBuilder.Embedded.pdb" />
    </files>
 </package>
@@ -1,68 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms</id>
-        <version>8.0.0</version>
+        <id>Umbraco.Cms</id>
+        <version>9.0.0</version>
        <title>Umbraco Cms</title>
        <authors>Umbraco HQ</authors>
        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET Core project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET Core project</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>
-
-            <group targetFramework="net472">
-
-                <dependency id="UmbracoCms.Web" version="[$version$]" />
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
-                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-
+            <group targetFramework="netcoreapp3.1">
+                <dependency id="Umbraco.Cms.Web" version="[$version$]" />
            </group>
-
-
        </dependencies>
+        <!--
+        We can't use content files, as the files need to be copied into the solution, links/shortcuts to the files
+        are not good enough
+        -->
+        <contentFiles />
    </metadata>
    <files>
-        <!-- files -->
-        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-        <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-        <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+        <!-- Content -->
+        <file src="$BuildTmp$\WebApp\wwwroot\umbraco\**\*.*" target="content\wwwroot\umbraco" />
+        <file src="$BuildTmp$\WebApp\umbraco\**\*.*" target="content\umbraco" />
+        <file src="$BuildTmp$\WebApp\config\**\*.*" target="content\config" />

-        <!-- these files are copied by install.ps1 -->
-        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+        <!-- Readme -->
+        <file src="tools\Readme.txt" target="Readme.txt" />
+        <file src="tools\ReadmeUpgrade.txt" target="ReadmeUpgrade.txt" />

-        <!-- tools -->
-        <!-- beware! install.ps1 not supported by PackageReference -->
-        <file src="tools\install.ps1" target="tools\install.ps1" />
-        <file src="tools\Readme.txt" target="tools\Readme.txt" />
-        <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-
-        <!-- config transforms -->
-        <!-- beware! config transforms not supported by PackageReference -->
-        <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-        <file src="tools\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME: Content\ !! and then... transform?! -->
-
-        <!-- UmbracoCms props and targets -->
-        <file src="build\**" target="build" />
+        <!-- UmbracoCms props and targets used to copy the content into the solution -->
+        <file src="build\**" target="build\" />
    </files>
 </package>
@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\is-cache\**;wwwroot\ms-cache\**</DefaultItemExcludes>
+    </PropertyGroup>
+
+</Project>
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
+    </PropertyGroup>
+
+    <Target Name="CopyUmbracoAssets" BeforeTargets="Build">
+        <ItemGroup>
+
+            <ContentFiles Include="$(ContentFilesPath)" />
+        </ItemGroup>
+        <Message Text="Copying content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
+        <Copy
+            SourceFiles="@(ContentFiles)"
+            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+
+    </Target>
+
+</Project>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-    <CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
-</Project>
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>  
-  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
-	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
-	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-  <Target Name="AddUmbracoFilesToOutput">
-    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
-    <ItemGroup>
-      <CustomFilesToInclude Include=".\App_Browsers\**\*">
-        <Dir>App_Browsers</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Code\**\*">
-        <Dir>App_Code</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Plugins\**\*">
-        <Dir>App_Plugins</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\amd64\**\*">
-        <Dir>bin\amd64</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\x86\**\*">
-        <Dir>bin\x86</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
-        <Dir>Config\Splashes</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\data\**\*">
-        <Dir>data</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco\**\*">
-        <Dir>umbraco</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Global.asax">
-        <Dir>.</Dir>
-      </CustomFilesToInclude>
-      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
-        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
-</Project>
@@ -1,139 +1,136 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+    <configSections xdt:Transform="InsertIfMissing" />
+    <configSections>
+        <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)">
+            <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </sectionGroup>
+    </configSections>

-  <appSettings xdt:Transform="InsertIfMissing" />
-  <appSettings>
-    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-  </appSettings>
+    <appSettings xdt:Transform="InsertIfMissing" />
+    <appSettings>
+        <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+    </appSettings>

-  <umbracoConfiguration xdt:Transform="InsertIfMissing">
-    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
-    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-  </umbracoConfiguration>
+    <umbracoConfiguration xdt:Transform="InsertIfMissing" />
+    <umbracoConfiguration>
+        <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
+        <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    </umbracoConfiguration>

-  <system.data xdt:Transform="InsertIfMissing">
-    <DbProviderFactories xdt:Transform="InsertIfMissing">
-      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
+    <system.data xdt:Transform="InsertIfMissing" />
+    <system.data>
+        <DbProviderFactories xdt:Transform="InsertIfMissing" />
+        <DbProviderFactories>
+            <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+            <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+        </DbProviderFactories>
+    </system.data>

-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <clientDependency xdt:Transform="RemoveAttributes(version)" />

-    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
-    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
-    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
+    <system.web xdt:Transform="InsertIfMissing" />
+    <system.web>
+        <siteMap xdt:Transform="Remove" />
+        <httpRuntime xdt:Transform="InsertIfMissing" />
+        <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
+        <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+        <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove" />
+        <compilation xdt:Transform="InsertIfMissing" />
+        <xhtmlConformance xdt:Transform="Remove" />

-    <xhtmlConformance xdt:Transform="Remove" />
+        <httpModules xdt:Transform="InsertIfMissing" />
+        <httpModules>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Don't remove the leading space below, this is to fix a quirk for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule, Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </httpModules>

-    <httpModules xdt:Transform="InsertIfMissing" />
-    <httpModules>
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove" />
+        </httpHandlers>
+    </system.web>

-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+    <system.webServer xdt:Transform="InsertIfMissing" />
+    <system.webServer>
+        <modules xdt:Transform="InsertIfMissing" />
+        <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)" />
+        <modules>
+            <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Don't remove the leading space below, this is to fix a quirk for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule, Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </modules>

-  <system.webServer xdt:Transform="InsertIfMissing" />
-  <system.webServer>
-    <modules xdt:Transform="InsertIfMissing" />
-    <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
-      <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <staticContent xdt:Transform="InsertIfMissing" />
+        <staticContent>
+            <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff" mimeType="font/woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff2" mimeType="font/woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+        </staticContent>

-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
-      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </modules>
+        <handlers>
+            <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </handlers>

-    <staticContent xdt:Transform="InsertIfMissing" />
-    <staticContent>
-      <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-    </staticContent>
+        <security xdt:Transform="InsertIfMissing" />
+        <security>
+            <requestFiltering xdt:Transform="InsertIfMissing" />
+            <requestFiltering>
+                <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
+            </requestFiltering>
+        </security>

-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
+    </system.webServer>

-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
-
-  </system.webServer>
-
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
- <runtime>
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
            <dependentAssembly xdt:Transform="Insert">
                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -177,20 +174,21 @@
        </assemblyBinding>
    </runtime>

-  <system.web.webPages.razor xdt:Transform="Remove" />
+    <system.web.webPages.razor xdt:Transform="Remove" />

-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="umbraco" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
-
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="App_Plugins" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
+    <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="umbraco" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing" />
+        <system.webServer>
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>

+    <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="App_Plugins" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing" />
+        <system.webServer>
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
 </configuration>
@@ -2,7 +2,7 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">>
    <appSettings>

-        <add key="serilog:using:File" value="Umbraco.Core" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
+        <add key="serilog:using:File" value="Umbraco.Infrastructure" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
        <add key="serilog:write-to:File.shared" xdt:Transform="Remove" xdt:Locator="Match(key)"/>

    </appSettings>
@@ -34,6 +34,7 @@
    if (-not (test-path $nuget))
    {
      Write-Host "Download NuGet..."
+	  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
      Invoke-WebRequest $source -OutFile $nuget
      if (-not $?) { throw "Failed to download NuGet." }
    }
@@ -168,7 +168,7 @@
    $buildConfiguration = "Release"

    $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\msbuild.umbraco.log"
+    $log = "$($this.BuildTemp)\build.umbraco.log"

    if ($this.BuildEnv.VisualStudio -eq $null)
    {
@@ -178,23 +178,37 @@
    Write-Host "Compile Umbraco"
    Write-Host "Logging to $log"

-    # beware of the weird double \\ at the end of paths
-    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-    &$this.BuildEnv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
-      /p:WarningLevel=0 `
-      /p:Configuration=$buildConfiguration `
-      /p:Platform=AnyCPU `
-      /p:UseWPP_CopyWebApplication=True `
-      /p:PipelineDependsOnBuild=False `
-      /p:OutDir="$($this.BuildTemp)\bin\\" `
-      /p:WebProjectOutputDir="$($this.BuildTemp)\WebApp\\" `
-      /p:Verbosity=minimal `
-      /t:Clean`;Rebuild `
-      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
-      /p:UmbracoBuild=True `
+   & dotnet build "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+      --configuration $buildConfiguration `
+      --output "$($this.BuildTemp)\bin\\" `
      > $log

-    if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
+   # get files into WebApp\bin
+    & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+      --configuration Release --output "$($this.BuildTemp)\WebApp\bin\\" `
+      > $log
+
+    & dotnet publish "$src\Umbraco.Persistance.SqlCe\Umbraco.Persistance.SqlCe.csproj" `
+      --configuration Release --output "$($this.BuildTemp)\SqlCe\" `
+      > $log
+
+    # remove extra files
+    $webAppBin = "$($this.BuildTemp)\WebApp\bin"
+    $excludeDirs = @("$($webAppBin)\Config","$($webAppBin)\refs","$($webAppBin)\runtimes","$($webAppBin)\Umbraco","$($webAppBin)\wwwroot")
+    $excludeFiles = @("$($webAppBin)\appsettings.*","$($webAppBin)\*.deps.json","$($webAppBin)\*.exe","$($webAppBin)\*.config","$($webAppBin)\*.runtimeconfig.json")
+    $this.RemoveDirectory($excludeDirs)
+    $this.RemoveFile($excludeFiles)
+
+    # copy rest of the files into WebApp
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Config", "*", "$($this.BuildTemp)\WebApp\config")
+    $this.RemoveFile("$($this.BuildTemp)\WebApp\Config\*.Release.*")
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco")
+    $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\lib")
+    $this.RemoveDirectory($excludeUmbracoDirs)
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Views", "*", "$($this.BuildTemp)\WebApp\Views")
+    Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\appsettings.json" "$($this.BuildTemp)\WebApp"
+
+    if (-not $?) { throw "Failed to compile Umbraco.Web.UI.NetCore." }

    # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
  })
@@ -253,6 +267,9 @@
      /p:UmbracoBuild=True `
      > $log

+      # copy Umbraco.Persistance.SqlCe files into WebApp
+      Copy-Item "$($this.BuildTemp)\tests\Umbraco.Persistance.SqlCe.*" "$($this.BuildTemp)\WebApp\bin"
+
    if (-not $?) { throw "Failed to compile tests." }

    # /p:UmbracoBuild tells the csproj that we are building from PS
@@ -265,11 +282,12 @@
    $src = "$($this.SolutionRoot)\src"
    $tmp = "$($this.BuildTemp)"
    $out = "$($this.BuildOutput)"
+    $templates = "$($this.SolutionRoot)\build\templates"

    $buildConfiguration = "Release"

    # restore web.config
-    $this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
+    #$this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")

    # cleanup build
    Write-Host "Clean build"
@@ -285,6 +303,7 @@
    mkdir "$tmp\Configs" > $null
    mkdir "$tmp\Configs\Lang" > $null
    mkdir "$tmp\WebApp\App_Data" > $null
+    mkdir "$tmp\Templates" > $null
    #mkdir "$tmp\WebApp\Media" > $null
    #mkdir "$tmp\WebApp\Views" > $null

@@ -298,10 +317,10 @@
      { -not $_.RelativeName.StartsWith("imageprocessor") })
    $this.CopyFiles("$tmp\WebApp\config", "*.js", "$tmp\Configs")
    $this.CopyFiles("$tmp\WebApp\config\lang", "*.xml", "$tmp\Configs\Lang")
-    $this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
+    #$this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")

-    Write-Host "Copy transformed web.config"
-    $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
+    # Write-Host "Copy transformed web.config"
+    # $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")

    # offset the modified timestamps on all umbraco dlls, as WebResources
    # break if date is in the future, which, due to timezone offsets can happen.
@@ -318,21 +337,36 @@
    {
      $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
    }
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")

    # copy Belle
    Write-Host "Copy Belle"
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\js", "*", "$tmp\WebApp\umbraco\js")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\views", "*", "$tmp\WebApp\umbraco\views")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views")
+
+
+
+    # Prepare templates
+    Write-Host "Copy template files"
+    $this.CopyFiles("$templates", "*", "$tmp\Templates")
+
+    Write-Host "Copy program.cs and startup.cs for templates"
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Program.cs", "$tmp\Templates\UmbracoSolution")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Startup.cs", "$tmp\Templates\UmbracoSolution")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "appsettings.json", "$tmp\Templates\UmbracoSolution")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "appsettings.Development.json", "$tmp\Templates\UmbracoSolution")
+
+  $this.RemoveDirectory("$tmp\Templates\UmbracoSolution\bin")
  })

  $ubuild.DefineMethod("PackageZip",
  {
+
    Write-Host "Create Zip packages"

    $src = "$($this.SolutionRoot)\src"
@@ -365,6 +399,7 @@
    $env:UMBRACO_RELEASE=$this.Version.Release
    $env:UMBRACO_COMMENT=$this.Version.Comment
    $env:UMBRACO_BUILD=$this.Version.Build
+    $env:UMBRACO_TMP="$($this.SolutionRoot)\build.tmp"

    if ($args -and $args[0] -eq "vso")
    {
@@ -381,16 +416,6 @@
    }
  })

-  $ubuild.DefineMethod("PrepareNuGet",
-  {
-    Write-Host "Prepare NuGet"
-
-    # add Web.config transform files to the NuGet package
-    Write-Host "Add web.config transforms to NuGet package"
-    mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform"
-
-  })
-
  $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json"

  $ubuild.DefineMethod("RestoreNuGet",
@@ -405,6 +430,7 @@
  $ubuild.DefineMethod("PackageNuGet",
  {
    $nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
+    $templates = "$($this.BuildTemp)\Templates"

    Write-Host "Create NuGet packages"

@@ -426,6 +452,18 @@
        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
    if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }

+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.SqlCe.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmssqlce.log"
+    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.SqlCe." }
+
+    &$this.BuildEnv.NuGet Pack "$templates\Umbraco.Templates.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.templates.log"
+    if (-not $?) { throw "Failed to pack NuGet Umbraco.Templates." }
+
    # run hook
    if ($this.HasMethod("PostPackageNuGet"))
    {
@@ -439,7 +477,7 @@
  {
    $this.VerifyNuGetConsistency(
      ("UmbracoCms", "UmbracoCms.Core", "UmbracoCms.Web"),
-      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
+      ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Configuration", "Umbraco.Web.UI.NetCore", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice"))
    if ($this.OnError()) { return }
  })

@@ -476,7 +514,7 @@
    $src = "$($this.SolutionRoot)\src"
    $out = $this.BuildOutput

-    # Check if the solution has been built		
+    # Check if the solution has been built
    if (!(Test-Path "$src\Umbraco.Web.UI.Client\node_modules")) {throw "Umbraco needs to be built before generating the Angular Docs"}

    "Moving to Umbraco.Web.UI.Docs folder"
@@ -487,7 +525,7 @@
    & npx gulp docs

    Pop-Location
-    
+
    # change baseUrl
    $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
    $IndexPath = "./api/index.html"
@@ -520,8 +558,6 @@
    if ($this.OnError()) { return }
    $this.VerifyNuGet()
    if ($this.OnError()) { return }
-    $this.PrepareNuGet()
-    if ($this.OnError()) { return }
    $this.PackageNuGet()
    if ($this.OnError()) { return }
    $this.PrepareAzureGallery()
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Templates</id>
+        <version>1.0.0</version>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Umbraco Cms templates for .NET Core Template Engine available through the dotnet CLI's new command</description>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <packageTypes>
+            <packageType name="Template" />
+        </packageTypes>
+    </metadata>
+</package>
@@ -0,0 +1,38 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "Umbraco HQ",
+    "classifications": [ "Web", "CMS", "Umbraco"],
+    "identity": "Umbraco.Templates",
+    "name": "Umbraco - Empty Solution",
+    "shortName": "umbraco",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "UmbracoSolution", // Will be replaced with the value provided via -n
+    "preferNameDirectory": true,
+    "symbols": {
+        "version": {
+            "type": "parameter",
+            "datatype": "string",
+            "defaultValue": "0.5.0-alpha002",
+            "description": "The version of Umbraco to load using NuGet",
+            "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
+        },
+        "namespaceReplacer": {
+            "type": "generated",
+            "generator": "coalesce",
+            "parameters": {
+                "sourceVariableName": "name",
+                "defaultValue": "UmbracoSolution",
+                "fallbackVariableName": "name"
+            },
+            "replaces":"Umbraco.Web.UI.NetCore"
+        },
+        "UseSqlCe":{
+            "type": "parameter",
+            "datatype":"bool",
+            "defaultValue": "false"
+        }
+    }
+}
@@ -0,0 +1,26 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:5000",
+      "sslPort": 5001
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Umbraco.Web.UI.NetCore": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Umbraco.Cms" Version="UMBRACO_VERSION_FROM_TEMPLATE" />
+        <PackageReference Include="Umbraco.Cms.SqlCe" Version="UMBRACO_VERSION_FROM_TEMPLATE" Condition="'$(UseSqlCe)' == 'true'" />
+        <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" Condition="'$(UseSqlCe)' == 'true'" />
+    </ItemGroup>
+
+</Project>
@@ -15,8 +15,8 @@ using System.Resources;

 // this is the ONLY ONE the CLR cares about for compatibility
 // should change ONLY when "hard" breaking compatibility (manual change)
-[assembly: AssemblyVersion("8.0.0")]
+[assembly: AssemblyVersion("0.5.0")]

 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.7.0")]
-[assembly: AssemblyInformationalVersion("8.7.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
+[assembly: AssemblyInformationalVersion("0.5.0-alpha002")]
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Umbraco Cms
+[assembly: InternalsVisibleTo("Umbraco.Tests")]
+[assembly: InternalsVisibleTo("Umbraco.Tests.Common")]
+[assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]
+
+// Allow this to be mocked in our unit tests
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <LangVersion>8</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <DocumentationFile>bin\Release\Umbraco.Configuration.xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <_UnmanagedRegistrationCache Remove="obj\Umbraco.Configuration.csproj.UnmanagedRegistration.cache" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
+        </AssemblyAttribute>
+    </ItemGroup>
+
+</Project>
@@ -13,13 +13,13 @@ namespace Umbraco.Web.Actions
            : base(items)
        { }

-        internal T GetAction<T>()
+        public T GetAction<T>()
            where T : IAction
        {
            return this.OfType<T>().FirstOrDefault();
        }

-        internal IEnumerable<IAction> GetByLetters(IEnumerable<string> letters)
+        public IEnumerable<IAction> GetByLetters(IEnumerable<string> letters)
        {
            var actions = this.ToArray(); // no worry: internally, it's already an array
            return letters
@@ -28,5 +28,15 @@ namespace Umbraco.Web.Actions
                .WhereNotNull()
                .ToList();
        }
+
+        public IReadOnlyList<IAction> FromEntityPermission(EntityPermission entityPermission)
+        {
+            var actions = this.ToArray(); // no worry: internally, it's already an array
+            return entityPermission.AssignedPermissions
+                .Where(x => x.Length == 1)
+                .SelectMany(x => actions.Where(y => y.Letter == x[0]))
+                .WhereNotNull()
+                .ToList();
+        }
    }
 }
@@ -4,7 +4,7 @@ using System.Linq;
 using Umbraco.Core.Composing;
 namespace Umbraco.Web.Actions
 {
-    internal class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
+    public class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
    {
        protected override ActionCollectionBuilder This => this;

@@ -1,13 +1,40 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;

 namespace Umbraco.Core
 {
-    internal static class AssemblyExtensions
+    public static class AssemblyExtensions
    {
+        private static string _rootDir = "";
+
+        /// <summary>
+        /// Utility method that returns the path to the root of the application, by getting the path to where the assembly where this
+        /// method is included is present, then traversing until it's past the /bin directory. Ie. this makes it work
+        /// even if the assembly is in a /bin/debug or /bin/release folder
+        /// </summary>
+        /// <returns></returns>
+        public static string GetRootDirectorySafe(this Assembly executingAssembly)
+        {
+            if (string.IsNullOrEmpty(_rootDir) == false)
+            {
+                return _rootDir;
+            }
+
+            var codeBase = executingAssembly.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var baseDirectory = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(baseDirectory))
+                throw new Exception("No root directory could be resolved. Please ensure that your Umbraco solution is correctly configured.");
+
+            _rootDir = baseDirectory.Contains("bin")
+                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
+                : baseDirectory;
+
+            return _rootDir;
+        }
+
        /// <summary>
        /// Returns the file used to load the assembly
        /// </summary>
@@ -2,12 +2,15 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
-using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Models;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;

-namespace Umbraco.Core.Models.Identity
+namespace Umbraco.Core.BackOffice
 {
    public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>, IRememberBeingDirty
    {
@@ -20,6 +23,7 @@ namespace Umbraco.Core.Models.Identity
        private string _name;
        private int _accessFailedCount;
        private string _passwordHash;
+        private string _passwordConfig;
        private string _culture;
        private ObservableCollection<IIdentityUserLogin> _logins;
        private Lazy<IEnumerable<IIdentityUserLogin>> _getLogins;
@@ -36,12 +40,12 @@ namespace Umbraco.Core.Models.Identity
        /// <param name="email">This is allowed to be null (but would need to be filled in if trying to persist this instance)</param>
        /// <param name="culture"></param>
        /// <returns></returns>
-        public static BackOfficeIdentityUser CreateNew(string username, string email, string culture)
+        public static BackOfficeIdentityUser CreateNew(GlobalSettings globalSettings, string username, string email, string culture)
        {
            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(username));
            if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(culture));

-            var user = new BackOfficeIdentityUser(Array.Empty<IReadOnlyUserGroup>());
+            var user = new BackOfficeIdentityUser(globalSettings, Array.Empty<IReadOnlyUserGroup>());
            user.DisableChangeTracking();
            user._userName = username;
            user._email = email;
@@ -54,12 +58,12 @@ namespace Umbraco.Core.Models.Identity
            return user;
        }

-        private BackOfficeIdentityUser(IReadOnlyUserGroup[] groups)
+        private BackOfficeIdentityUser(GlobalSettings globalSettings, IReadOnlyUserGroup[] groups)
        {
            _startMediaIds = Array.Empty<int>();
            _startContentIds = Array.Empty<int>();
            _allowedSections = Array.Empty<string>();
-            _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
+            _culture = globalSettings.DefaultUILanguage;

            // must initialize before setting groups
            _roles = new ObservableCollection<IdentityUserRole<string>>();
@@ -72,10 +76,11 @@ namespace Umbraco.Core.Models.Identity
        /// <summary>
        /// Creates an existing user with the specified groups
        /// </summary>
+        /// <param name="globalSettings"></param>
        /// <param name="userId"></param>
        /// <param name="groups"></param>
-        public BackOfficeIdentityUser(int userId, IEnumerable<IReadOnlyUserGroup> groups)
-            : this(groups.ToArray())
+        public BackOfficeIdentityUser(GlobalSettings globalSettings, int userId, IEnumerable<IReadOnlyUserGroup> groups)
+            : this(globalSettings, groups.ToArray())
        {
            // use the property setters - they do more than just setting a field
            Id = userId;
@@ -86,8 +91,8 @@ namespace Umbraco.Core.Models.Identity
        /// </summary>
        public bool HasIdentity => _hasIdentity;

-        public int[] CalculatedMediaStartNodeIds { get; internal set; }
-        public int[] CalculatedContentStartNodeIds { get; internal set; }
+        public int[] CalculatedMediaStartNodeIds { get; set; }
+        public int[] CalculatedContentStartNodeIds { get; set; }

        public override int Id
        {
@@ -171,6 +176,12 @@ namespace Umbraco.Core.Models.Identity
            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _passwordHash, nameof(PasswordHash));
        }

+        public string PasswordConfig
+        {
+            get => _passwordConfig;
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _passwordConfig, nameof(PasswordConfig));
+        }
+

        /// <summary>
        /// Content start nodes assigned to the User (not ones assigned to the user's groups)
@@ -254,7 +265,7 @@ namespace Umbraco.Core.Models.Identity
        /// <summary>
        /// Based on the user's lockout end date, this will determine if they are locked out
        /// </summary>
-        internal bool IsLockedOut
+        public bool IsLockedOut
        {
            get
            {
@@ -266,7 +277,7 @@ namespace Umbraco.Core.Models.Identity
        /// <summary>
        /// This is a 1:1 mapping with IUser.IsApproved
        /// </summary>
-        internal bool IsApproved { get; set; }
+        public bool IsApproved { get; set; }

        /// <summary>
        /// Overridden to make the retrieval lazy
@@ -403,6 +414,18 @@ namespace Umbraco.Core.Models.Identity
            _beingDirty.EnableChangeTracking();
        }

+        public event PropertyChangedEventHandler PropertyChanged
+        {
+            add
+            {
+                _beingDirty.PropertyChanged += value;
+            }
+            remove
+            {
+                _beingDirty.PropertyChanged -= value;
+            }
+        }
+
        #endregion

        //Custom comparer for enumerables
@@ -413,5 +436,6 @@ namespace Umbraco.Core.Models.Identity
        private static readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
            (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
            groups => groups.GetHashCode());
+
    }
 }
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.BackOffice
+{
+    /// <summary>
+    /// The result returned from the IBackOfficeUserPasswordChecker
+    /// </summary>
+    public enum BackOfficeUserPasswordCheckerResult
+    {
+        ValidCredentials,
+        InvalidCredentials,
+        FallbackToDefaultChecker
+    }
+}
@@ -0,0 +1,68 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Security.Claims;
+using System.Security.Principal;
+using Umbraco.Core;
+using Umbraco.Core.BackOffice;
+
+namespace Umbraco.Extensions
+{
+    public static class ClaimsPrincipalExtensions
+    {
+        /// <summary>
+        /// This will return the current back office identity if the IPrincipal is the correct type
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public static UmbracoBackOfficeIdentity GetUmbracoIdentity(this IPrincipal user)
+        {
+            //If it's already a UmbracoBackOfficeIdentity
+            if (user.Identity is UmbracoBackOfficeIdentity backOfficeIdentity) return backOfficeIdentity;
+
+            //Check if there's more than one identity assigned and see if it's a UmbracoBackOfficeIdentity and use that
+            if (user is ClaimsPrincipal claimsPrincipal)
+            {
+                backOfficeIdentity = claimsPrincipal.Identities.OfType<UmbracoBackOfficeIdentity>().FirstOrDefault();
+                if (backOfficeIdentity != null) return backOfficeIdentity;
+            }
+
+            //Otherwise convert to a UmbracoBackOfficeIdentity if it's auth'd
+            if (user.Identity is ClaimsIdentity claimsIdentity
+                && claimsIdentity.IsAuthenticated
+                && UmbracoBackOfficeIdentity.FromClaimsIdentity(claimsIdentity, out var umbracoIdentity))
+            {
+                return umbracoIdentity;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the remaining seconds on an auth ticket for the user based on the claim applied to the user durnig authentication
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public static double GetRemainingAuthSeconds(this IPrincipal user) => user.GetRemainingAuthSeconds(DateTimeOffset.UtcNow);
+
+        /// <summary>
+        /// Returns the remaining seconds on an auth ticket for the user based on the claim applied to the user durnig authentication
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="now"></param>
+        /// <returns></returns>
+        public static double GetRemainingAuthSeconds(this IPrincipal user, DateTimeOffset now)
+        {
+            var umbIdentity = user.GetUmbracoIdentity();
+            if (umbIdentity == null) return 0;
+
+            var ticketExpires = umbIdentity.FindFirstValue(Constants.Security.TicketExpiresClaimType);
+            if (ticketExpires.IsNullOrWhiteSpace()) return 0;
+
+            var utcExpired = DateTimeOffset.Parse(ticketExpires, null, DateTimeStyles.RoundtripKind);
+
+            var secondsRemaining = utcExpired.Subtract(now).TotalSeconds;
+            return secondsRemaining;
+        }
+    }
+}
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.BackOffice
+{
+    /// <summary>
+    /// Used by the BackOfficeUserManager to check the username/password which allows for developers to more easily
+    /// set the logic for this procedure.
+    /// </summary>
+    public interface IBackOfficeUserPasswordChecker
+    {
+        /// <summary>
+        /// Checks a password for a user
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This will allow a developer to auto-link a local account which is required if the user queried doesn't exist locally.
+        /// The user parameter will always contain the username, if the user doesn't exist locally, the other properties will not be filled in.
+        /// A developer can then create a local account by filling in the properties and using UserManager.CreateAsync
+        /// </remarks>
+        Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeIdentityUser user, string password);
+    }
+}
@@ -0,0 +1,87 @@
+using System;
+
+
+namespace Umbraco.Core.BackOffice
+{
+    /// <summary>
+    /// This class is used by events raised from the BackofficeUserManager
+    /// </summary>
+    public class IdentityAuditEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The action that got triggered from the audit event
+        /// </summary>
+        public AuditEvent Action { get; private set; }
+
+        /// <summary>
+        /// Current date/time in UTC format
+        /// </summary>
+        public DateTime DateTimeUtc { get; private set; }
+
+        /// <summary>
+        /// The source IP address of the user performing the action
+        /// </summary>
+        public string IpAddress { get; private set; }
+
+        /// <summary>
+        /// The user affected by the event raised
+        /// </summary>
+        public int AffectedUser { get; private set; }
+
+        /// <summary>
+        /// If a user is performing an action on a different user, then this will be set. Otherwise it will be -1
+        /// </summary>
+        public int PerformingUser { get; private set; }
+
+        /// <summary>
+        /// An optional comment about the action being logged
+        /// </summary>
+        public string Comment { get; private set; }
+
+        /// <summary>
+        /// This property is always empty except in the LoginFailed event for an unknown user trying to login
+        /// </summary>
+        public string AffectedUsername { get; private set; }
+
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="ipAddress"></param>
+        /// <param name="comment"></param>
+        /// <param name="performingUser"></param>
+        /// <param name="affectedUser"></param>
+        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser, string comment, int affectedUser, string affectedUsername)
+        {
+            DateTimeUtc = DateTime.UtcNow;
+            Action = action;
+            IpAddress = ipAddress;
+            Comment = comment;            
+            PerformingUser = performingUser;
+            AffectedUsername = affectedUsername;
+            AffectedUser = affectedUser;
+        }
+
+        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser, string comment, string affectedUsername)
+            : this(action, ipAddress, performingUser, comment, -1, affectedUsername)
+        {
+        }
+
+    }
+
+    public enum AuditEvent
+    {
+        AccountLocked,
+        AccountUnlocked,
+        ForgotPasswordRequested,
+        ForgotPasswordChangedSuccess,
+        LoginFailed,
+        LoginRequiresVerification,
+        LoginSucces,
+        LogoutSuccess,
+        PasswordChanged,
+        PasswordReset,
+        ResetAccessFailedCount
+    }
+}
@@ -1,22 +1,25 @@
 using System;
+using Microsoft.Extensions.Options;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Models;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;

-namespace Umbraco.Core.Models.Identity
+namespace Umbraco.Core.BackOffice
 {
    public class IdentityMapDefinition : IMapDefinition
    {
        private readonly ILocalizedTextService _textService;
        private readonly IEntityService _entityService;
-        private readonly IGlobalSettings _globalSettings;
+        private readonly GlobalSettings _globalSettings;

-        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings)
+        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IOptions<GlobalSettings> globalSettings)
        {
            _textService = textService;
            _entityService = entityService;
-            _globalSettings = globalSettings;
+            _globalSettings = globalSettings.Value;
        }

        public void DefineMaps(UmbracoMapper mapper)
@@ -24,7 +27,7 @@ namespace Umbraco.Core.Models.Identity
            mapper.Define<IUser, BackOfficeIdentityUser>(
                (source, context) =>
                {
-                    var target = new BackOfficeIdentityUser(source.Id, source.Groups);
+                    var target = new BackOfficeIdentityUser(_globalSettings, source.Id, source.Groups);
                    target.DisableChangeTracking();
                    return target;
                },
@@ -56,6 +59,7 @@ namespace Umbraco.Core.Models.Identity
            target.Name = source.Name;
            target.AccessFailedCount = source.FailedPasswordAttempts;
            target.PasswordHash = GetPasswordHash(source.RawPasswordValue);
+            target.PasswordConfig = source.PasswordConfiguration;
            target.StartContentIds = source.StartContentIds;
            target.StartMediaIds = source.StartMediaIds;
            target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); // project CultureInfo to string
@@ -1,32 +1,41 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Security.Claims;
-using System.Security.Principal;
-using System.Web;
-using System.Web.Security;
-using Microsoft.AspNet.Identity;
-using Microsoft.Owin.Security;
-using Newtonsoft.Json;
-using Umbraco.Core.Configuration;

-namespace Umbraco.Core.Security
+namespace Umbraco.Core.BackOffice
 {

    /// <summary>
    /// A custom user identity for the Umbraco backoffice
    /// </summary>
-    /// <remarks>
-    /// This inherits from FormsIdentity for backwards compatibility reasons since we still support the forms auth cookie, in v8 we can
-    /// change over to 'pure' asp.net identity and just inherit from ClaimsIdentity.
-    /// </remarks>
    [Serializable]
    public class UmbracoBackOfficeIdentity : ClaimsIdentity
    {
-        public static UmbracoBackOfficeIdentity FromClaimsIdentity(ClaimsIdentity identity)
+        public static bool FromClaimsIdentity(ClaimsIdentity identity, out UmbracoBackOfficeIdentity backOfficeIdentity)
+        {
+            //validate that all claims exist
+            foreach (var t in RequiredBackOfficeIdentityClaimTypes)
+            {
+                //if the identity doesn't have the claim, or the claim value is null
+                if (identity.HasClaim(x => x.Type == t) == false || identity.HasClaim(x => x.Type == t && x.Value.IsNullOrWhiteSpace()))
+                {
+                    backOfficeIdentity = null;
+                    return false;
+                }
+            }
+
+            backOfficeIdentity = new UmbracoBackOfficeIdentity(identity);
+            return true;
+        }
+
+        /// <summary>
+        /// Create a back office identity based on an existing claims identity
+        /// </summary>
+        /// <param name="identity"></param>
+        private UmbracoBackOfficeIdentity(ClaimsIdentity identity)
+            : base(identity.Claims, Constants.Security.BackOfficeAuthenticationType)
        {
-            return new UmbracoBackOfficeIdentity(identity);
        }

        /// <summary>
@@ -38,22 +47,20 @@ namespace Umbraco.Core.Security
        /// <param name="startContentNodes"></param>
        /// <param name="startMediaNodes"></param>
        /// <param name="culture"></param>
-        /// <param name="sessionId"></param>
        /// <param name="securityStamp"></param>
        /// <param name="allowedApps"></param>
        /// <param name="roles"></param>
        public UmbracoBackOfficeIdentity(int userId, string username, string realName,
            IEnumerable<int> startContentNodes, IEnumerable<int> startMediaNodes, string culture,
-            string sessionId, string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
+            string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
            : base(Enumerable.Empty<Claim>(), Constants.Security.BackOfficeAuthenticationType) //this ctor is used to ensure the IsAuthenticated property is true
        {
            if (allowedApps == null) throw new ArgumentNullException(nameof(allowedApps));
            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(username));
            if (string.IsNullOrWhiteSpace(realName)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(realName));
            if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(culture));
-            if (string.IsNullOrWhiteSpace(sessionId)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(sessionId));
            if (string.IsNullOrWhiteSpace(securityStamp)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(securityStamp));
-            AddRequiredClaims(userId, username, realName, startContentNodes, startMediaNodes, culture, sessionId, securityStamp, allowedApps, roles);
+            AddRequiredClaims(userId, username, realName, startContentNodes, startMediaNodes, culture, securityStamp, allowedApps, roles);
        }

        /// <summary>
@@ -68,43 +75,21 @@ namespace Umbraco.Core.Security
        /// <param name="startContentNodes"></param>
        /// <param name="startMediaNodes"></param>
        /// <param name="culture"></param>
-        /// <param name="sessionId"></param>
        /// <param name="securityStamp"></param>
        /// <param name="allowedApps"></param>
        /// <param name="roles"></param>
        public UmbracoBackOfficeIdentity(ClaimsIdentity childIdentity,
            int userId, string username, string realName,
            IEnumerable<int> startContentNodes, IEnumerable<int> startMediaNodes, string culture,
-            string sessionId, string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
+            string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
        : base(childIdentity.Claims, Constants.Security.BackOfficeAuthenticationType)
        {
            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(username));
            if (string.IsNullOrWhiteSpace(realName)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(realName));
            if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(culture));
-            if (string.IsNullOrWhiteSpace(sessionId)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(sessionId));
            if (string.IsNullOrWhiteSpace(securityStamp)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(securityStamp));
-            Actor = childIdentity;
-            AddRequiredClaims(userId, username, realName, startContentNodes, startMediaNodes, culture, sessionId, securityStamp, allowedApps, roles);
-        }

-        /// <summary>
-        /// Create a back office identity based on an existing claims identity
-        /// </summary>
-        /// <param name="identity"></param>
-        private UmbracoBackOfficeIdentity(ClaimsIdentity identity)
-            : base(identity.Claims, Constants.Security.BackOfficeAuthenticationType)
-        {
-            Actor = identity;
-
-            //validate that all claims exist
-            foreach (var t in RequiredBackOfficeIdentityClaimTypes)
-            {
-                //if the identity doesn't have the claim, or the claim value is null
-                if (identity.HasClaim(x => x.Type == t) == false || identity.HasClaim(x => x.Type == t && x.Value.IsNullOrWhiteSpace()))
-                {
-                    throw new InvalidOperationException("Cannot create a " + typeof(UmbracoBackOfficeIdentity) + " from " + typeof(ClaimsIdentity) + " since the required claim " + t + " is missing");
-                }
-            }
+            AddRequiredClaims(userId, username, realName, startContentNodes, startMediaNodes, culture, securityStamp, allowedApps, roles);
        }

        public const string Issuer = Constants.Security.BackOfficeAuthenticationType;
@@ -123,8 +108,7 @@ namespace Umbraco.Core.Security
            Constants.Security.StartContentNodeIdClaimType,
            Constants.Security.StartMediaNodeIdClaimType,
            ClaimTypes.Locality,
-            Constants.Security.SessionIdClaimType,
-            Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType
+            Constants.Security.SecurityStampClaimType
        };

        /// <summary>
@@ -132,7 +116,7 @@ namespace Umbraco.Core.Security
        /// </summary>
        private void AddRequiredClaims(int userId, string username, string realName,
            IEnumerable<int> startContentNodes, IEnumerable<int> startMediaNodes, string culture,
-            string sessionId, string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
+            string securityStamp, IEnumerable<string> allowedApps, IEnumerable<string> roles)
        {
            //This is the id that 'identity' uses to check for the user id
            if (HasClaim(x => x.Type == ClaimTypes.NameIdentifier) == false)
@@ -148,7 +132,7 @@ namespace Umbraco.Core.Security
            {
                foreach (var startContentNode in startContentNodes)
                {
-                    AddClaim(new Claim(Constants.Security.StartContentNodeIdClaimType, startContentNode.ToInvariantString(), ClaimValueTypes.Integer32, Issuer, Issuer, this));    
+                    AddClaim(new Claim(Constants.Security.StartContentNodeIdClaimType, startContentNode.ToInvariantString(), ClaimValueTypes.Integer32, Issuer, Issuer, this));
                }
            }

@@ -163,13 +147,9 @@ namespace Umbraco.Core.Security
            if (HasClaim(x => x.Type == ClaimTypes.Locality) == false)
                AddClaim(new Claim(ClaimTypes.Locality, culture, ClaimValueTypes.String, Issuer, Issuer, this));

-            if (HasClaim(x => x.Type == Constants.Security.SessionIdClaimType) == false && SessionId.IsNullOrWhiteSpace() == false)
-                AddClaim(new Claim(Constants.Security.SessionIdClaimType, sessionId, ClaimValueTypes.String, Issuer, Issuer, this));
-
-            //The security stamp claim is also required... this is because this claim type is hard coded
-            // by the SecurityStampValidator, see: https://katanaproject.codeplex.com/workitem/444
-            if (HasClaim(x => x.Type == Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType) == false)
-                AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, securityStamp, ClaimValueTypes.String, Issuer, Issuer, this));
+            //The security stamp claim is also required
+            if (HasClaim(x => x.Type == Constants.Security.SecurityStampClaimType) == false)
+                AddClaim(new Claim(Constants.Security.SecurityStampClaimType, securityStamp, ClaimValueTypes.String, Issuer, Issuer, this));

            //Add each app as a separate claim
            if (HasClaim(x => x.Type == Constants.Security.AllowedApplicationsClaimType) == false && allowedApps != null)
@@ -192,7 +172,7 @@ namespace Umbraco.Core.Security
            }

        }
-        
+
        /// <inheritdoc />
        /// <summary>
        /// Gets the type of authenticated identity.
@@ -202,7 +182,7 @@ namespace Umbraco.Core.Security
        /// </returns>
        public override string AuthenticationType => Issuer;

-        private int[] _startContentNodes;   
+        private int[] _startContentNodes;
        public int[] StartContentNodes => _startContentNodes ?? (_startContentNodes = FindAll(x => x.Type == Constants.Security.StartContentNodeIdClaimType).Select(app => int.TryParse(app.Value, out var i) ? i : default).Where(x => x != default).ToArray());

        private int[] _startMediaNodes;
@@ -215,25 +195,26 @@ namespace Umbraco.Core.Security

        public string RealName => this.FindFirstValue(ClaimTypes.GivenName);

-        public string Username => this.GetUserName();
+        public string Username => this.FindFirstValue(ClaimTypes.Name);

        public string Culture => this.FindFirstValue(ClaimTypes.Locality);

-        public string SessionId
-        {
-            get => this.FindFirstValue(Constants.Security.SessionIdClaimType);
-            set
-            {
-                var existing = FindFirst(Constants.Security.SessionIdClaimType);
-                if (existing != null)
-                    TryRemoveClaim(existing);
-                AddClaim(new Claim(Constants.Security.SessionIdClaimType, value, ClaimValueTypes.String, Issuer, Issuer, this));
-            }
-        }
-
-        public string SecurityStamp => this.FindFirstValue(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType);
+        public string SecurityStamp => this.FindFirstValue(Constants.Security.SecurityStampClaimType);

        public string[] Roles => this.FindAll(x => x.Type == DefaultRoleClaimType).Select(role => role.Value).ToArray();
-        
+
+        /// <summary>
+        /// Overridden to remove any temporary claims that shouldn't be copied
+        /// </summary>
+        /// <returns></returns>
+        public override ClaimsIdentity Clone()
+        {
+            var clone = base.Clone();
+
+            foreach (var claim in clone.FindAll(x => x.Type == Constants.Security.TicketExpiresClaimType).ToList())
+                clone.RemoveClaim(claim);
+
+            return clone;
+        }
    }
 }
@@ -1,45 +0,0 @@
-using System;
-using System.Reflection;
-using System.Web;
-using Umbraco.Core;
-
-// no binding redirect for now = de-activate
-//[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies)
-    /// </summary>
-    public sealed class BindingRedirects
-    {
-        public static void Initialize()
-        {
-            // this only gets called when an assembly can't be resolved
-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
-        }
-
-        /// <summary>
-        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
-
-            // keep here for reference - we don't use AutoMapper
-            /*
-            //AutoMapper:
-            // this is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
-            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
-            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
-            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
-                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
-            */
-
-            return null;
-        }
-    }
-}
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
@@ -15,11 +14,9 @@ namespace Umbraco.Core.Cache
            Func<T> getCacheItem,
            TimeSpan? timeout,
            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
            string[] dependentFiles = null)
        {
-            var result = provider.Get(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            var result = provider.Get(cacheKey, () => getCacheItem(), timeout, isSliding, dependentFiles);
            return result == null ? default(T) : result.TryConvertTo<T>().Result;
        }

@@ -28,11 +25,9 @@ namespace Umbraco.Core.Cache
            Func<T> getCacheItem,
            TimeSpan? timeout = null,
            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
            string[] dependentFiles = null)
        {
-            provider.Insert(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            provider.Insert(cacheKey, () => getCacheItem(), timeout, isSliding, dependentFiles);
        }

        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this IAppCache provider, string keyStartsWith)
@@ -1,5 +1,4 @@
 using System;
-using System.Web;

 namespace Umbraco.Core.Cache
 {
@@ -8,29 +7,12 @@ 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>
        public AppCaches(
            IAppPolicyCache runtimeCache,
-            IAppCache requestCache,
+            IRequestCache requestCache,
            IsolatedCaches isolatedCaches)
        {
            RuntimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
@@ -63,7 +45,7 @@ namespace Umbraco.Core.Cache
        /// <para>The per-request caches works on top of the current HttpContext items.</para>
        /// <para>Outside a web environment, the behavior of that cache is unspecified.</para>
        /// </remarks>
-        public IAppCache RequestCache { get; }
+        public IRequestCache RequestCache { get; }

        /// <summary>
        /// Gets the runtime cache.
@@ -17,24 +17,24 @@ namespace Umbraco.Core.Cache
        /// <param name="cacheFactory"></param>
        protected AppPolicedCacheDictionary(Func<TKey, IAppPolicyCache> cacheFactory)
        {
-            CacheFactory = cacheFactory;
+            _cacheFactory = cacheFactory;
        }

        /// <summary>
        /// Gets the internal cache factory, for tests only!
        /// </summary>
-        internal readonly Func<TKey, IAppPolicyCache> CacheFactory;
+        private readonly Func<TKey, IAppPolicyCache> _cacheFactory;

        /// <summary>
        /// Gets or creates a cache.
        /// </summary>
        public IAppPolicyCache GetOrCreate(TKey key)
-            => _caches.GetOrAdd(key, k => CacheFactory(k));
+            => _caches.GetOrAdd(key, k => _cacheFactory(k));

        /// <summary>
        /// Tries to get a cache.
        /// </summary>
-        public Attempt<IAppPolicyCache> Get(TKey key)
+        protected Attempt<IAppPolicyCache> Get(TKey key)
            => _caches.TryGetValue(key, out var cache) ? Attempt.Succeed(cache) : Attempt.Fail<IAppPolicyCache>();

        /// <summary>
@@ -56,7 +56,7 @@ namespace Umbraco.Core.Cache
        /// <summary>
        /// Clears a cache.
        /// </summary>
-        public void ClearCache(TKey key)
+        protected void ClearCache(TKey key)
        {
            if (_caches.TryGetValue(key, out var cache))
                cache.Clear();
@@ -71,4 +71,4 @@ namespace Umbraco.Core.Cache
                cache.Clear();
        }
    }
-}
+}
@@ -12,5 +12,7 @@

        public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
        public const string MacroFromAliasCacheKey = "macroFromAlias_";
+
+        public const string UserGroupGetByAliasCacheKeyPrefix = "UserGroupRepository_GetByAlias_";
    }
 }
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
-using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;

 namespace Umbraco.Web.Cache
@@ -18,14 +15,14 @@ namespace Umbraco.Web.Cache
    public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCacheRefresher, ContentCacheRefresher.JsonPayload>
    {
        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;
        private readonly IDomainService _domainService;

-        public ContentCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IdkMap idkMap, IDomainService domainService)
-            : base(appCaches)
+        public ContentCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService, IIdKeyMap idKeyMap, IDomainService domainService)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
            _domainService = domainService;
        }

@@ -57,7 +54,7 @@ namespace Umbraco.Web.Cache
                //By GUID Key
                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent>(payload.Key));

-                _idkMap.ClearCache(payload.Id);
+                _idKeyMap.ClearCache(payload.Id);

                // remove those that are in the branch
                if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
@@ -140,14 +137,6 @@ namespace Umbraco.Web.Cache

        public class JsonPayload
        {
-            [Obsolete("Use the constructor specifying a GUID instead, using this constructor will result in not refreshing all caches")]
-            public JsonPayload(int id, TreeChangeTypes changeTypes)
-            {
-                Id = id;
-                ChangeTypes = changeTypes;
-            }
-
-            [JsonConstructor]
            public JsonPayload(int id, Guid? key, TreeChangeTypes changeTypes)
            {
                Id = id;
@@ -5,6 +5,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.PublishedCache;
@@ -16,14 +17,14 @@ namespace Umbraco.Web.Cache
        private readonly IPublishedSnapshotService _publishedSnapshotService;
        private readonly IPublishedModelFactory _publishedModelFactory;
        private readonly IContentTypeCommonRepository _contentTypeCommonRepository;
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;

-        public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
-            : base(appCaches)
+        public ContentTypeCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IIdKeyMap idKeyMap, IContentTypeCommonRepository contentTypeCommonRepository)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
            _publishedModelFactory = publishedModelFactory;
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
            _contentTypeCommonRepository = contentTypeCommonRepository;
        }

@@ -69,7 +70,7 @@ namespace Umbraco.Web.Cache

            foreach (var id in payloads.Select(x => x.Id))
            {
-                _idkMap.ClearCache(id);
+                _idKeyMap.ClearCache(id);
            }

            if (payloads.Any(x => x.ItemType == typeof(IContentType).Name))
@@ -4,6 +4,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Web.PublishedCache;

@@ -14,14 +15,14 @@ namespace Umbraco.Web.Cache
    {
        private readonly IPublishedSnapshotService _publishedSnapshotService;
        private readonly IPublishedModelFactory _publishedModelFactory;
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;

-        public DataTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap)
-            : base(appCaches)
+        public DataTypeCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IIdKeyMap idKeyMap)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
            _publishedModelFactory = publishedModelFactory;
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
        }

        #region Define
@@ -55,7 +56,7 @@ namespace Umbraco.Web.Cache

            foreach (var payload in payloads)
            {
-                _idkMap.ClearCache(payload.Id);
+                _idKeyMap.ClearCache(payload.Id);
            }

            // TODO: not sure I like these?
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Caching;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;

@@ -12,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.
@@ -30,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)
@@ -44,7 +43,7 @@ namespace Umbraco.Core.Cache
        {
            var cached = InnerCache.Get(key, () =>
            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
+                var result = SafeLazy.GetSafeLazy(factory);
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                // do not store null values (backward compat), clone / reset to go into the cache
                return value == null ? null : CheckCloneableAndTracksChanges(value);
@@ -67,32 +66,32 @@ namespace Umbraco.Core.Cache
        }

        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, string[] dependentFiles = null)
        {
            var cached = InnerCache.Get(key, () =>
            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
+                var result = SafeLazy.GetSafeLazy(factory);
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                // do not store null values (backward compat), clone / reset to go into the cache
-                return value == null ? null : CheckCloneableAndTracksChanges(value); 
+                return value == null ? null : CheckCloneableAndTracksChanges(value);

                // clone / reset to go into the cache
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);
+            }, timeout, isSliding, dependentFiles);

            // clone / reset to go into the cache
            return CheckCloneableAndTracksChanges(cached);
        }

        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, string[] dependentFiles = null)
        {
            InnerCache.Insert(key, () =>
            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
+                var result = SafeLazy.GetSafeLazy(factory);
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                // do not store null values (backward compat), clone / reset to go into the cache
                return value == null ? null : CheckCloneableAndTracksChanges(value);
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);
+            }, timeout, isSliding, dependentFiles);
        }

        /// <inheritdoc />
@@ -108,9 +107,9 @@ namespace Umbraco.Core.Cache
        }

        /// <inheritdoc />
-        public void ClearOfType(string typeName)
+        public void ClearOfType(Type type)
        {
-            InnerCache.ClearOfType(typeName);
+            InnerCache.ClearOfType(type);
        }

        /// <inheritdoc />
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
@@ -8,30 +9,39 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Implements <see cref="IAppCache"/> on top of a concurrent dictionary.
    /// </summary>
-    public class DictionaryAppCache : IAppCache
+    public class DictionaryAppCache : IRequestCache
    {
        /// <summary>
        /// Gets the internal items dictionary, for tests only!
        /// </summary>
-        internal readonly ConcurrentDictionary<string, object> Items = new ConcurrentDictionary<string, object>();
+        private readonly ConcurrentDictionary<string, object> _items = new ConcurrentDictionary<string, object>();
+
+        public int Count => _items.Count;
+
+        /// <inheritdoc />
+        public bool IsAvailable => true;

        /// <inheritdoc />
        public virtual object Get(string key)
        {
-            return Items.TryGetValue(key, out var value) ? value : null;
+            return _items.TryGetValue(key, out var value) ? value : null;
        }

        /// <inheritdoc />
        public virtual object Get(string key, Func<object> factory)
        {
-            return Items.GetOrAdd(key, _ => factory());
+            return _items.GetOrAdd(key, _ => factory());
        }

+        public bool Set(string key, object value) => _items.TryAdd(key, value);
+
+        public bool Remove(string key) => _items.TryRemove(key, out _);
+
        /// <inheritdoc />
        public virtual IEnumerable<object> SearchByKey(string keyStartsWith)
        {
            var items = new List<object>();
-            foreach (var (key, value) in Items)
+            foreach (var (key, value) in _items)
                if (key.InvariantStartsWith(keyStartsWith))
                    items.Add(value);
            return items;
@@ -42,7 +52,7 @@ namespace Umbraco.Core.Cache
        {
            var compiled = new Regex(regex, RegexOptions.Compiled);
            var items = new List<object>();
-            foreach (var (key, value) in Items)
+            foreach (var (key, value) in _items)
                if (compiled.IsMatch(key))
                    items.Add(value);
            return items;
@@ -51,46 +61,50 @@ namespace Umbraco.Core.Cache
        /// <inheritdoc />
        public virtual void Clear()
        {
-            Items.Clear();
+            _items.Clear();
        }

        /// <inheritdoc />
        public virtual void Clear(string key)
        {
-            Items.TryRemove(key, out _);
+            _items.TryRemove(key, out _);
        }

        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
        {
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
+            _items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == type);
        }

        /// <inheritdoc />
        public virtual void ClearOfType<T>()
        {
            var typeOfT = typeof(T);
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
+            ClearOfType(typeOfT);
        }

        /// <inheritdoc />
        public virtual void ClearOfType<T>(Func<string, T, bool> predicate)
        {
            var typeOfT = typeof(T);
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
+            _items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
        }

        /// <inheritdoc />
        public virtual void ClearByKey(string keyStartsWith)
        {
-            Items.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
+            _items.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
        }

        /// <inheritdoc />
        public virtual void ClearByRegex(string regex)
        {
            var compiled = new Regex(regex, RegexOptions.Compiled);
-            Items.RemoveAll(kvp => compiled.IsMatch(kvp.Key));
+            _items.RemoveAll(kvp => compiled.IsMatch(kvp.Key));
        }
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator() => _items.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
    }
 }
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Web.Composing;
+using Umbraco.Core.Sync;

 namespace Umbraco.Web.Cache
 {
@@ -21,6 +21,15 @@ namespace Umbraco.Web.Cache
    /// </remarks>
    public sealed class DistributedCache
    {
+        private readonly IServerMessenger _serverMessenger;
+        private readonly CacheRefresherCollection _cacheRefreshers;
+
+        public DistributedCache(IServerMessenger serverMessenger, CacheRefresherCollection cacheRefreshers)
+        {
+            _serverMessenger = serverMessenger;
+            _cacheRefreshers = cacheRefreshers;
+        }
+
        #region Core notification methods

        /// <summary>
@@ -37,7 +46,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || instances.Length == 0 || getNumericId == null) return;

-            Current.ServerMessenger.PerformRefresh(
+            _serverMessenger.PerformRefresh(
                GetRefresherById(refresherGuid),
                getNumericId,
                instances);
@@ -52,7 +61,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || id == default(int)) return;

-            Current.ServerMessenger.PerformRefresh(
+            _serverMessenger.PerformRefresh(
                GetRefresherById(refresherGuid),
                id);
        }
@@ -66,7 +75,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || id == Guid.Empty) return;

-            Current.ServerMessenger.PerformRefresh(
+            _serverMessenger.PerformRefresh(
                GetRefresherById(refresherGuid),
                id);
        }
@@ -77,7 +86,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || payload == null) return;

-            Current.ServerMessenger.PerformRefresh(
+            _serverMessenger.PerformRefresh(
                GetRefresherById(refresherGuid),
                payload);
        }
@@ -88,23 +97,10 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || payloads == null) return;

-            Current.ServerMessenger.PerformRefresh(
+            _serverMessenger.PerformRefresh(
                GetRefresherById(refresherGuid),
                payloads.ToArray());
        }
-        /// <summary>
-        /// Notifies the distributed cache, for a specified <see cref="ICacheRefresher"/>.
-        /// </summary>
-        /// <param name="refresherGuid">The unique identifier of the ICacheRefresher.</param>
-        /// <param name="jsonPayload">The notification content.</param>
-        public void RefreshByJson(Guid refresherGuid, string jsonPayload)
-        {
-            if (refresherGuid == Guid.Empty || jsonPayload.IsNullOrWhiteSpace()) return;
-
-            Current.ServerMessenger.PerformRefresh(
-                GetRefresherById(refresherGuid),
-                jsonPayload);
-        }

        ///// <summary>
        ///// Notifies the distributed cache, for a specified <see cref="ICacheRefresher"/>.
@@ -115,7 +111,7 @@ namespace Umbraco.Web.Cache
        //{
        //    if (refresherId == Guid.Empty || payload == null) return;

-        //    Current.ServerMessenger.Notify(
+        //    _serverMessenger.Notify(
        //        Current.ServerRegistrar.Registrations,
        //        GetRefresherById(refresherId),
        //        json);
@@ -129,7 +125,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty) return;

-            Current.ServerMessenger.PerformRefreshAll(
+            _serverMessenger.PerformRefreshAll(
                GetRefresherById(refresherGuid));
        }

@@ -142,7 +138,7 @@ namespace Umbraco.Web.Cache
        {
            if (refresherGuid == Guid.Empty || id == default(int)) return;

-            Current.ServerMessenger.PerformRemove(
+            _serverMessenger.PerformRemove(
                GetRefresherById(refresherGuid),
                id);
        }
@@ -159,7 +155,7 @@ namespace Umbraco.Web.Cache
        /// </remarks>
        public void Remove<T>(Guid refresherGuid, Func<T, int> getNumericId, params T[] instances)
        {
-            Current.ServerMessenger.PerformRemove(
+            _serverMessenger.PerformRemove(
                GetRefresherById(refresherGuid),
                getNumericId,
                instances);
@@ -168,9 +164,9 @@ namespace Umbraco.Web.Cache
        #endregion

        // helper method to get an ICacheRefresher by its unique identifier
-        private static ICacheRefresher GetRefresherById(Guid refresherGuid)
+        private  ICacheRefresher GetRefresherById(Guid refresherGuid)
        {
-            return Current.CacheRefreshers[refresherGuid];
+            return _cacheRefreshers[refresherGuid];
        }
    }
 }
@@ -1,6 +1,7 @@
 using System;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.PublishedCache;

@@ -10,8 +11,8 @@ namespace Umbraco.Web.Cache
    {
        private readonly IPublishedSnapshotService _publishedSnapshotService;

-        public DomainCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService)
-            : base(appCaches)
+        public DomainCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
        }
@@ -10,34 +10,37 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Implements a fast <see cref="IAppCache"/> on top of a concurrent dictionary.
    /// </summary>
-    internal class FastDictionaryAppCache : IAppCache
+    public class FastDictionaryAppCache : IAppCache
    {
+
        /// <summary>
        /// Gets the internal items dictionary, for tests only!
        /// </summary>
-        internal readonly ConcurrentDictionary<string, Lazy<object>> Items = new ConcurrentDictionary<string, Lazy<object>>();
+        private readonly ConcurrentDictionary<string, Lazy<object>> _items = new ConcurrentDictionary<string, Lazy<object>>();
+
+        public int Count => _items.Count;

        /// <inheritdoc />
        public object Get(string cacheKey)
        {
-            Items.TryGetValue(cacheKey, out var result); // else null
-            return result == null ? null : FastDictionaryAppCacheBase.GetSafeLazyValue(result); // return exceptions as null
+            _items.TryGetValue(cacheKey, out var result); // else null
+            return result == null ? null : SafeLazy.GetSafeLazyValue(result); // return exceptions as null
        }

        /// <inheritdoc />
        public object Get(string cacheKey, Func<object> getCacheItem)
        {
-            var result = Items.GetOrAdd(cacheKey, k => FastDictionaryAppCacheBase.GetSafeLazy(getCacheItem));
+            var result = _items.GetOrAdd(cacheKey, k => SafeLazy.GetSafeLazy(getCacheItem));

            var value = result.Value; // will not throw (safe lazy)
-            if (!(value is FastDictionaryAppCacheBase.ExceptionHolder eh))
+            if (!(value is SafeLazy.ExceptionHolder eh))
                return value;

            // and... it's in the cache anyway - so contrary to other cache providers,
            // which would trick with GetSafeLazyValue, we need to remove by ourselves,
            // in order NOT to cache exceptions

-            Items.TryRemove(cacheKey, out result);
+            _items.TryRemove(cacheKey, out result);
            eh.Exception.Throw(); // throw once!
            return null; // never reached
        }
@@ -45,9 +48,9 @@ namespace Umbraco.Core.Cache
        /// <inheritdoc />
        public IEnumerable<object> SearchByKey(string keyStartsWith)
        {
-            return Items
+            return _items
                .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith))
-                .Select(kvp => FastDictionaryAppCacheBase.GetSafeLazyValue(kvp.Value))
+                .Select(kvp => SafeLazy.GetSafeLazyValue(kvp.Value))
                .Where(x => x != null);
        }

@@ -55,44 +58,43 @@ namespace Umbraco.Core.Cache
        public IEnumerable<object> SearchByRegex(string regex)
        {
            var compiled = new Regex(regex, RegexOptions.Compiled);
-            return Items
+            return _items
                .Where(kvp => compiled.IsMatch(kvp.Key))
-                .Select(kvp => FastDictionaryAppCacheBase.GetSafeLazyValue(kvp.Value))
+                .Select(kvp => SafeLazy.GetSafeLazyValue(kvp.Value))
                .Where(x => x != null);
        }

        /// <inheritdoc />
        public void Clear()
        {
-            Items.Clear();
+            _items.Clear();
        }

        /// <inheritdoc />
        public void Clear(string key)
        {
-            Items.TryRemove(key, out _);
+            _items.TryRemove(key, out _);
        }

        /// <inheritdoc />
-        public void ClearOfType(string typeName)
+        public void ClearOfType(Type type)
        {
-            var type = TypeFinder.GetTypeByName(typeName);
            if (type == null) return;
            var isInterface = type.IsInterface;

-            foreach (var kvp in Items
+            foreach (var kvp in _items
                .Where(x =>
                {
                    // entry.Value is Lazy<object> and not null, its value may be null
                    // remove null values as well, does not hurt
                    // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = SafeLazy.GetSafeLazyValue(x.Value, true);

                    // if T is an interface remove anything that implements that interface
                    // otherwise remove exact types (not inherited types)
                    return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
        }

        /// <inheritdoc />
@@ -101,20 +103,20 @@ namespace Umbraco.Core.Cache
            var typeOfT = typeof(T);
            var isInterface = typeOfT.IsInterface;

-            foreach (var kvp in Items
+            foreach (var kvp in _items
                .Where(x =>
                {
                    // entry.Value is Lazy<object> and not null, its value may be null
                    // remove null values as well, does not hurt
                    // compare on exact type, don't use "is"
                    // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = SafeLazy.GetSafeLazyValue(x.Value, true);

                    // if T is an interface remove anything that implements that interface
                    // otherwise remove exact types (not inherited types)
                    return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
                }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
        }

        /// <inheritdoc />
@@ -123,14 +125,14 @@ namespace Umbraco.Core.Cache
            var typeOfT = typeof(T);
            var isInterface = typeOfT.IsInterface;

-            foreach (var kvp in Items
+            foreach (var kvp in _items
                .Where(x =>
                {
                    // entry.Value is Lazy<object> and not null, its value may be null
                    // remove null values as well, does not hurt
                    // compare on exact type, don't use "is"
                    // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = SafeLazy.GetSafeLazyValue(x.Value, true);
                    if (value == null) return true;

                    // if T is an interface remove anything that implements that interface
@@ -139,24 +141,24 @@ namespace Umbraco.Core.Cache
                            // run predicate on the 'public key' part only, ie without prefix
                            && predicate(x.Key, (T)value);
                }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
        }

        /// <inheritdoc />
        public void ClearByKey(string keyStartsWith)
        {
-            foreach (var ikvp in Items
+            foreach (var ikvp in _items
                .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith)))
-                Items.TryRemove(ikvp.Key, out _);
+                _items.TryRemove(ikvp.Key, out _);
        }

        /// <inheritdoc />
        public void ClearByRegex(string regex)
        {
            var compiled = new Regex(regex, RegexOptions.Compiled);
-            foreach (var ikvp in Items
+            foreach (var ikvp in _items
                .Where(kvp => compiled.IsMatch(kvp.Key)))
-                Items.TryRemove(ikvp.Key, out _);
+                _items.TryRemove(ikvp.Key, out _);
        }
    }
 }
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.ExceptionServices;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Composing;

@@ -11,14 +10,11 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Provides a base class to fast, dictionary-based <see cref="IAppCache"/> implementations.
    /// </summary>
-    internal abstract class FastDictionaryAppCacheBase : IAppCache
+    public abstract class FastDictionaryAppCacheBase : IAppCache
    {
        // prefix cache keys so we know which one are ours
        protected const string CacheItemPrefix = "umbrtmche";

-        // an object that represent a value that has not been created yet
-        protected internal static readonly object ValueNotCreated = new object();
-
        #region IAppCache

        /// <inheritdoc />
@@ -35,7 +31,7 @@ namespace Umbraco.Core.Cache
            {
                ExitReadLock();
            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+            return result == null ? null : SafeLazy.GetSafeLazyValue(result); // return exceptions as null
        }

        /// <inheritdoc />
@@ -59,7 +55,7 @@ namespace Umbraco.Core.Cache
            }

            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null); // backward compat, don't store null values in the cache
        }

@@ -82,7 +78,7 @@ namespace Umbraco.Core.Cache
                ExitReadLock();
            }
            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null); // backward compatible, don't store null values in the cache
        }

@@ -118,9 +114,8 @@ namespace Umbraco.Core.Cache
        }

        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
        {
-            var type = TypeFinder.GetTypeByName(typeName);
            if (type == null) return;
            var isInterface = type.IsInterface;
            try
@@ -132,7 +127,7 @@ namespace Umbraco.Core.Cache
                        // entry.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>) x.Value, true);

                        // if T is an interface remove anything that implements that interface
                        // otherwise remove exact types (not inherited types)
@@ -162,7 +157,7 @@ namespace Umbraco.Core.Cache
                        // remove null values as well, does not hurt
                        // compare on exact type, don't use "is"
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>) x.Value, true);

                        // if T is an interface remove anything that implements that interface
                        // otherwise remove exact types (not inherited types)
@@ -193,7 +188,7 @@ namespace Umbraco.Core.Cache
                        // remove null values as well, does not hurt
                        // compare on exact type, don't use "is"
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>) x.Value, true);
                        if (value == null) return true;

                        // if T is an interface remove anything that implements that interface
@@ -272,57 +267,7 @@ namespace Umbraco.Core.Cache
            return $"{CacheItemPrefix}-{key}";
        }

-        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
-        {
-            // try to generate the value and if it fails,
-            // wrap in an ExceptionHolder - would be much simpler
-            // to just use lazy.IsValueFaulted alas that field is
-            // internal
-            return new Lazy<object>(() =>
-            {
-                try
-                {
-                    return getCacheItem();
-                }
-                catch (Exception e)
-                {
-                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
-                }
-            });
-        }

-        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            // if onlyIfValueIsCreated, do not trigger value creation
-            // must return something, though, to differentiate from null values
-            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-
-            // if execution has thrown then lazy.IsValueCreated is false
-            // and lazy.IsValueFaulted is true (but internal) so we use our
-            // own exception holder (see Lazy<T> source code) to return null
-            if (lazy.Value is ExceptionHolder) return null;
-
-            // we have a value and execution has not thrown so returning
-            // here does not throw - unless we're re-entering, take care of it
-            try
-            {
-                return lazy.Value;
-            }
-            catch (InvalidOperationException e)
-            {
-                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
-            }
-        }
-
-        internal class ExceptionHolder
-        {
-            public ExceptionHolder(ExceptionDispatchInfo e)
-            {
-                Exception = e;
-            }
-
-            public ExceptionDispatchInfo Exception { get; }
-        }

        #endregion
    }
@@ -0,0 +1,190 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Implements a fast <see cref="IAppCache"/> on top of HttpContext.Items.
+    /// </summary>
+    /// <remarks>
+    /// <para>If no current HttpContext items can be found (no current HttpContext,
+    /// or no Items...) then this cache acts as a pass-through and does not cache
+    /// anything.</para>
+    /// </remarks>
+    public class GenericDictionaryRequestAppCache : FastDictionaryAppCacheBase, IRequestCache
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class with a context, for unit tests!
+        /// </summary>
+        public GenericDictionaryRequestAppCache(Func<IDictionary<object, object>> requestItems) : base()
+        {
+            ContextItems = requestItems;
+        }
+
+        private Func<IDictionary<object, object>> ContextItems { get; }
+
+        public bool IsAvailable => TryGetContextItems(out _);
+
+        private bool TryGetContextItems(out IDictionary<object, object> items)
+        {
+            items = ContextItems?.Invoke();
+            return items != null;
+        }
+
+        /// <inheritdoc />
+        public override object Get(string key, Func<object> factory)
+        {
+            //no place to cache so just return the callback result
+            if (!TryGetContextItems(out var items)) return factory();
+
+            key = GetCacheKey(key);
+
+            Lazy<object> result;
+
+            try
+            {
+                EnterWriteLock();
+                result = items[key] as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+
+                if (result == null || SafeLazy.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = SafeLazy.GetSafeLazy(factory);
+                    items[key] = result;
+                }
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (value is SafeLazy.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        public bool Set(string key, object value)
+        {
+            //no place to cache so just return the callback result
+            if (!TryGetContextItems(out var items)) return false;
+            key = GetCacheKey(key);
+            try
+            {
+
+                EnterWriteLock();
+                items[key] = SafeLazy.GetSafeLazy(() => value);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+            return true;
+        }
+
+        public bool Remove(string key)
+        {
+            //no place to cache so just return the callback result
+            if (!TryGetContextItems(out var items)) return false;
+            key = GetCacheKey(key);
+            try
+            {
+
+                EnterWriteLock();
+                items.Remove(key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+            return true;
+        }
+
+        #region Entries
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+
+            if (!TryGetContextItems(out var items)) return Enumerable.Empty<DictionaryEntry>();
+
+            return items.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string s && s.StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            if (!TryGetContextItems(out var items)) return;
+
+            items.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return !TryGetContextItems(out var items) ? null : items[key];
+        }
+
+        #endregion
+
+        #region Lock
+
+        private const string ContextItemsLockKey = "Umbraco.Core.Cache.HttpRequestCache::LockEntered";
+
+        protected override void EnterReadLock() => EnterWriteLock();
+
+        protected override void EnterWriteLock()
+        {
+            if (!TryGetContextItems(out var items)) return;
+
+            // note: cannot keep 'entered' as a class variable here,
+            // since there is one per request - so storing it within
+            // ContextItems - which is locked, so this should be safe
+
+            var entered = false;
+            Monitor.Enter(items, ref entered);
+            items[ContextItemsLockKey] = entered;
+        }
+
+        protected override void ExitReadLock() => ExitWriteLock();
+
+        protected override void ExitWriteLock()
+        {
+            if (!TryGetContextItems(out var items)) return;
+
+            var entered = (bool?)items[ContextItemsLockKey] ?? false;
+            if (entered)
+                Monitor.Exit(items);
+            items.Remove(ContextItemsLockKey);
+        }
+
+        #endregion
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            if (!TryGetContextItems(out var items))
+            {
+                yield break;
+            }
+
+            foreach (var item in items)
+            {
+                yield return new KeyValuePair<string, object>(item.Key.ToString(), item.Value);
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Web;
+using Umbraco.Core.Composing;

 namespace Umbraco.Core.Cache
 {
@@ -15,37 +15,31 @@ namespace Umbraco.Core.Cache
    /// or no Items...) then this cache acts as a pass-through and does not cache
    /// anything.</para>
    /// </remarks>
-    internal class HttpRequestAppCache : FastDictionaryAppCacheBase
+    public class HttpRequestAppCache : FastDictionaryAppCacheBase, IRequestCache
    {
-        private readonly HttpContextBase _context;
-
        /// <summary>
        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class with a context, for unit tests!
        /// </summary>
-        public HttpRequestAppCache(HttpContextBase context)
+        public HttpRequestAppCache(Func<IDictionary> requestItems) : base()
        {
-            _context = context;
+            ContextItems = requestItems;
        }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class.
-        /// </summary>
-        /// <remarks>
-        /// <para>Will use HttpContext.Current.</para>
-        /// TODO: https://github.com/umbraco/Umbraco-CMS/issues/4239 - use IHttpContextAccessor NOT HttpContext.Current
-        /// </remarks>
-        public HttpRequestAppCache()
-        { }
+        private Func<IDictionary> ContextItems { get; }

-        private IDictionary ContextItems => _context?.Items ?? HttpContext.Current?.Items;
+        public bool IsAvailable => TryGetContextItems(out _);

-        private bool HasContextItems => _context?.Items != null || HttpContext.Current != null;
+        private bool TryGetContextItems(out IDictionary items)
+        {
+            items = ContextItems?.Invoke();
+            return items != null;
+        }

        /// <inheritdoc />
        public override object Get(string key, Func<object> factory)
        {
            //no place to cache so just return the callback result
-            if (HasContextItems == false) return factory();
+            if (!TryGetContextItems(out var items)) return factory();

            key = GetCacheKey(key);

@@ -54,16 +48,16 @@ namespace Umbraco.Core.Cache
            try
            {
                EnterWriteLock();
-                result = ContextItems[key] as Lazy<object>; // null if key not found
+                result = items[key] as Lazy<object>; // null if key not found

                // cannot create value within the lock, so if result.IsValueCreated is false, just
                // do nothing here - means that if creation throws, a race condition could cause
                // more than one thread to reach the return statement below and throw - accepted.

-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                if (result == null || SafeLazy.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = GetSafeLazy(factory);
-                    ContextItems[key] = result;
+                    result = SafeLazy.GetSafeLazy(factory);
+                    items[key] = result;
                }
            }
            finally
@@ -79,32 +73,68 @@ namespace Umbraco.Core.Cache
            //return result.Value;

            var value = result.Value; // will not throw (safe lazy)
-            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            if (value is SafeLazy.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
            return value;
        }

+        public bool Set(string key, object value)
+        {
+            //no place to cache so just return the callback result
+            if (!TryGetContextItems(out var items)) return false;
+            key = GetCacheKey(key);
+            try
+            {
+
+                EnterWriteLock();
+                items[key] = SafeLazy.GetSafeLazy(() => value);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+            return true;
+        }
+
+        public bool Remove(string key)
+        {
+            //no place to cache so just return the callback result
+            if (!TryGetContextItems(out var items)) return false;
+            key = GetCacheKey(key);
+            try
+            {
+
+                EnterWriteLock();
+                items.Remove(key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+            return true;
+        }
+
        #region Entries

        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
        {
            const string prefix = CacheItemPrefix + "-";

-            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
+            if (!TryGetContextItems(out var items)) return Enumerable.Empty<DictionaryEntry>();

-            return ContextItems.Cast<DictionaryEntry>()
+            return items.Cast<DictionaryEntry>()
                .Where(x => x.Key is string s && s.StartsWith(prefix));
        }

        protected override void RemoveEntry(string key)
        {
-            if (HasContextItems == false) return;
+            if (!TryGetContextItems(out var items)) return;

-            ContextItems.Remove(key);
+            items.Remove(key);
        }

        protected override object GetEntry(string key)
        {
-            return HasContextItems ? ContextItems[key] : null;
+            return !TryGetContextItems(out var items) ? null : items[key];
        }

        #endregion
@@ -117,28 +147,44 @@ namespace Umbraco.Core.Cache

        protected override void EnterWriteLock()
        {
-            if (HasContextItems)
-            {
-                // note: cannot keep 'entered' as a class variable here,
-                // since there is one per request - so storing it within
-                // ContextItems - which is locked, so this should be safe
+            if (!TryGetContextItems(out var items)) return;

-                var entered = false;
-                Monitor.Enter(ContextItems.SyncRoot, ref entered);
-                ContextItems[ContextItemsLockKey] = entered;
-            }
+            // note: cannot keep 'entered' as a class variable here,
+            // since there is one per request - so storing it within
+            // ContextItems - which is locked, so this should be safe
+
+            var entered = false;
+            Monitor.Enter(items.SyncRoot, ref entered);
+            items[ContextItemsLockKey] = entered;
        }

        protected override void ExitReadLock() => ExitWriteLock();

        protected override void ExitWriteLock()
        {
-            var entered = (bool?) ContextItems[ContextItemsLockKey] ?? false;
+            if (!TryGetContextItems(out var items)) return;
+
+            var entered = (bool?)items[ContextItemsLockKey] ?? false;
            if (entered)
-                Monitor.Exit(ContextItems.SyncRoot);
-            ContextItems.Remove(ContextItemsLockKey);
+                Monitor.Exit(items.SyncRoot);
+            items.Remove(ContextItemsLockKey);
        }

        #endregion
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            if (!TryGetContextItems(out var items))
+            {
+                yield break;
+            }
+
+            foreach (DictionaryEntry item in items)
+            {
+                yield return new KeyValuePair<string, object>(item.Key.ToString(), item.Value);
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
    }
 }
@@ -51,14 +51,14 @@ namespace Umbraco.Core.Cache
        /// <summary>
        /// Removes items of a specified type from the cache.
        /// </summary>
-        /// <param name="typeName">The name of the type to remove.</param>
+        /// <param name="type">The type to remove.</param>
        /// <remarks>
        /// <para>If the type is an interface, then all items of a type implementing that interface are
        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
        /// the specified type are not removed).</para>
        /// <para>Performs a case-sensitive search.</para>
        /// </remarks>
-        void ClearOfType(string typeName);
+        void ClearOfType(Type type);

        /// <summary>
        /// Removes items of a specified type from the cache.
@@ -1,5 +1,4 @@
 using System;
-using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
@@ -17,8 +16,6 @@ namespace Umbraco.Core.Cache
        /// <param name="factory">A factory function that can create the item.</param>
        /// <param name="timeout">An optional cache timeout.</param>
        /// <param name="isSliding">An optional value indicating whether the cache timeout is sliding (default is false).</param>
-        /// <param name="priority">An optional cache priority (default is Normal).</param>
-        /// <param name="removedCallback">An optional callback to handle removals.</param>
        /// <param name="dependentFiles">Files the cache entry depends on.</param>
        /// <returns>The item.</returns>
        object Get(
@@ -26,8 +23,6 @@ namespace Umbraco.Core.Cache
            Func<object> factory,
            TimeSpan? timeout,
            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
            string[] dependentFiles = null);

        /// <summary>
@@ -37,16 +32,12 @@ namespace Umbraco.Core.Cache
        /// <param name="factory">A factory function that can create the item.</param>
        /// <param name="timeout">An optional cache timeout.</param>
        /// <param name="isSliding">An optional value indicating whether the cache timeout is sliding (default is false).</param>
-        /// <param name="priority">An optional cache priority (default is Normal).</param>
-        /// <param name="removedCallback">An optional callback to handle removals.</param>
        /// <param name="dependentFiles">Files the cache entry depends on.</param>
        void Insert(
            string key,
            Func<object> factory,
            TimeSpan? timeout = null,
            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
            string[] dependentFiles = null);
    }
 }
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Cache
    /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
    /// against a already resolved object instead of looking the object back up by id.
    /// </remarks>
-    interface ICacheRefresher<T> : ICacheRefresher
+    public interface ICacheRefresher<T> : ICacheRefresher
    {
        void Refresh(T instance);
        void Remove(T instance);
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Umbraco.Core.Events;
-using Umbraco.Core.Services.Implement;

 namespace Umbraco.Web.Cache
 {
@@ -3,7 +3,7 @@
    /// <summary>
    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
    /// </summary>
-    interface IJsonCacheRefresher : ICacheRefresher
+    public interface IJsonCacheRefresher : ICacheRefresher
    {
        /// <summary>
        /// Refreshes, clears, etc... any cache based on the information provided in the json
@@ -3,7 +3,7 @@
    /// <summary>
    /// A cache refresher that supports refreshing cache based on a custom payload
    /// </summary>
-    interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
+    public interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
    {
        /// <summary>
        /// Refreshes, clears, etc... any cache based on the information provided in the payload
@@ -5,7 +5,7 @@ using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
-    internal interface IRepositoryCachePolicy<TEntity, TId>
+    public interface IRepositoryCachePolicy<TEntity, TId>
        where TEntity : class, IEntity
    {
        /// <summary>
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    public interface IRequestCache : IAppCache, IEnumerable<KeyValuePair<string, object>>
+    {
+        bool Set(string key, object value);
+        bool Remove(string key);
+
+        /// <summary>
+        /// Returns true if the request cache is available otherwise false
+        /// </summary>
+        bool IsAvailable { get; }
+    }
+}
@@ -1,4 +1,5 @@
-using Umbraco.Core.Sync;
+using Umbraco.Core.Serialization;
+using Umbraco.Core.Sync;

 namespace Umbraco.Core.Cache
 {
@@ -7,15 +8,19 @@ namespace Umbraco.Core.Cache
    /// </summary>
    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher
+    public abstract class JsonCacheRefresherBase<TInstanceType, TJsonPayload> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher
        where TInstanceType : class, ICacheRefresher
    {
+        protected IJsonSerializer JsonSerializer { get; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="JsonCacheRefresherBase{TInstanceType}"/>.
        /// </summary>
        /// <param name="appCaches">A cache helper.</param>
-        protected JsonCacheRefresherBase(AppCaches appCaches) : base(appCaches)
-        { }
+        protected JsonCacheRefresherBase(AppCaches appCaches, IJsonSerializer jsonSerializer) : base(appCaches)
+        {
+            JsonSerializer = jsonSerializer;
+        }

        /// <summary>
        /// Refreshes as specified by a json payload.
@@ -25,5 +30,24 @@ namespace Umbraco.Core.Cache
        {
            OnCacheUpdated(This, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
        }
+
+        #region Json
+        /// <summary>
+        /// Deserializes a json payload into an object payload.
+        /// </summary>
+        /// <param name="json">The json payload.</param>
+        /// <returns>The deserialized object payload.</returns>
+        public TJsonPayload[] Deserialize(string json)
+        {
+            return JsonSerializer.Deserialize<TJsonPayload[]>(json);
+        }
+
+
+        public string Serialize(params TJsonPayload[] jsonPayloads)
+        {
+            return JsonSerializer.Serialize(jsonPayloads);
+        }
+        #endregion
+
    }
 }
@@ -2,6 +2,7 @@
 using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.PublishedCache;
@@ -10,11 +11,9 @@ using static Umbraco.Web.Cache.LanguageCacheRefresher.JsonPayload;
 namespace Umbraco.Web.Cache
 {
    public sealed class LanguageCacheRefresher : PayloadCacheRefresherBase<LanguageCacheRefresher, LanguageCacheRefresher.JsonPayload>
-
-    //CacheRefresherBase<LanguageCacheRefresher>
    {
-        public LanguageCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService)
-            : base(appCaches)
+        public LanguageCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
        }
@@ -1,19 +1,19 @@
 using System;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Repositories;
 using System.Linq;
-using Newtonsoft.Json;
 using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Serialization;

 namespace Umbraco.Web.Cache
 {
-    public sealed class MacroCacheRefresher : JsonCacheRefresherBase<MacroCacheRefresher>
+    public sealed class MacroCacheRefresher : PayloadCacheRefresherBase<MacroCacheRefresher, MacroCacheRefresher.JsonPayload>
    {
-        public MacroCacheRefresher(AppCaches appCaches)
-            : base(appCaches)
-        { }
+        public MacroCacheRefresher(AppCaches appCaches, IJsonSerializer jsonSerializer)
+            : base(appCaches, jsonSerializer)
+        {
+
+        }

        #region Define

@@ -57,7 +57,6 @@ namespace Umbraco.Web.Cache

            base.Refresh(json);
        }
-
        #endregion

        #region Json
@@ -75,21 +74,6 @@ namespace Umbraco.Web.Cache
            public string Alias { get; }
        }

-        private static JsonPayload[] Deserialize(string json)
-        {
-            return JsonConvert.DeserializeObject<JsonPayload[]>(json);
-        }
-
-        internal static string Serialize(params Macro[] macros)
-        {
-            return JsonConvert.SerializeObject(macros.Select(x => new JsonPayload(x.Id, x.Alias)).ToArray());
-        }
-
-        internal static string Serialize(params IMacro[] macros)
-        {
-            return JsonConvert.SerializeObject(macros.Select(x => new JsonPayload(x.Id, x.Alias)).ToArray());
-        }
-
        #endregion

        #region Helpers
@@ -2,13 +2,10 @@
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Repositories;
-using System.Linq;
-using System.Xml.Linq;
 using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
-using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;

 namespace Umbraco.Web.Cache
@@ -16,13 +13,13 @@ namespace Umbraco.Web.Cache
    public sealed class MediaCacheRefresher : PayloadCacheRefresherBase<MediaCacheRefresher, MediaCacheRefresher.JsonPayload>
    {
        private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;

-        public MediaCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IdkMap idkMap)
-            : base(appCaches)
+        public MediaCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService, IIdKeyMap idKeyMap)
+            : base(appCaches, serializer)
        {
            _publishedSnapshotService = publishedSnapshotService;
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
        }

        #region Define
@@ -47,14 +44,14 @@ namespace Umbraco.Web.Cache

            if (anythingChanged)
            {
-                Current.AppCaches.ClearPartialViewCache();
+                AppCaches.ClearPartialViewCache();

                var mediaCache = AppCaches.IsolatedCaches.Get<IMedia>();

                foreach (var payload in payloads)
                {
                    if (payload.ChangeTypes == TreeChangeTypes.Remove)
-                       _idkMap.ClearCache(payload.Id);
+                       _idKeyMap.ClearCache(payload.Id);

                    if (!mediaCache) continue;

@@ -1,29 +1,29 @@
-using Newtonsoft.Json;
+//using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;

 namespace Umbraco.Web.Cache
 {
    public sealed class MemberCacheRefresher : PayloadCacheRefresherBase<MemberCacheRefresher, MemberCacheRefresher.JsonPayload>
    {
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;
        private readonly LegacyMemberCacheRefresher _legacyMemberRefresher;

-        public MemberCacheRefresher(AppCaches appCaches, IdkMap idkMap)
-            : base(appCaches)
+        public MemberCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IIdKeyMap idKeyMap)
+            : base(appCaches, serializer)
        {
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
            _legacyMemberRefresher = new LegacyMemberCacheRefresher(this, appCaches);
        }

-        public class JsonPayload 
+        public class JsonPayload
        {
-            [JsonConstructor]
+            //[JsonConstructor]
            public JsonPayload(int id, string username)
            {
                Id = id;
@@ -32,7 +32,6 @@ namespace Umbraco.Web.Cache

            public int Id { get; }
            public string Username { get; }
-
        }

        #region Define
@@ -80,14 +79,14 @@ namespace Umbraco.Web.Cache

            foreach (var p in payloads)
            {
-                _idkMap.ClearCache(p.Id);
+                _idKeyMap.ClearCache(p.Id);
                if (memberCache)
                {
                    memberCache.Result.Clear(RepositoryCacheKeys.GetKey<IMember>(p.Id));
                    memberCache.Result.Clear(RepositoryCacheKeys.GetKey<IMember>(p.Username));
-                }   
+                }
            }
-            
+
        }

        #endregion
@@ -1,16 +1,18 @@
 using System;
 using System.Linq;
-using Newtonsoft.Json;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
+using Umbraco.Core.Serialization;

 namespace Umbraco.Web.Cache
 {
-    public sealed class MemberGroupCacheRefresher : JsonCacheRefresherBase<MemberGroupCacheRefresher>
+    public sealed class MemberGroupCacheRefresher : PayloadCacheRefresherBase<MemberGroupCacheRefresher, MemberGroupCacheRefresher.JsonPayload>
    {
-        public MemberGroupCacheRefresher(AppCaches appCaches)
-            : base(appCaches)
-        { }
+        public MemberGroupCacheRefresher(AppCaches appCaches, IJsonSerializer jsonSerializer)
+            : base(appCaches, jsonSerializer)
+        {
+
+        }

        #region Define

@@ -68,15 +70,6 @@ namespace Umbraco.Web.Cache
            public int Id { get; }
        }

-        private JsonPayload[] Deserialize(string json)
-        {
-            return JsonConvert.DeserializeObject<JsonPayload[]>(json);
-        }
-
-        internal static string Serialize(params IMemberGroup[] groups)
-        {
-            return JsonConvert.SerializeObject(groups.Select(x => new JsonPayload(x.Id, x.Name)).ToArray());
-        }

        #endregion
    }
@@ -1,22 +1,25 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
    /// Implements <see cref="IAppPolicyCache"/> and do not cache.
    /// </summary>
-    public class NoAppCache : IAppPolicyCache
+    public class NoAppCache : IAppPolicyCache, IRequestCache
    {
-        private NoAppCache() { }
+        protected NoAppCache() { }

        /// <summary>
        /// Gets the singleton instance.
        /// </summary>
        public static NoAppCache Instance { get; } = new NoAppCache();

+        /// <inheritdoc />
+        public bool IsAvailable => false;
+
        /// <inheritdoc />
        public virtual object Get(string cacheKey)
        {
@@ -29,6 +32,10 @@ namespace Umbraco.Core.Cache
            return factory();
        }

+        public bool Set(string key, object value) => false;
+
+        public bool Remove(string key) => false;
+
        /// <inheritdoc />
        public virtual IEnumerable<object> SearchByKey(string keyStartsWith)
        {
@@ -42,13 +49,13 @@ namespace Umbraco.Core.Cache
        }

        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, string[] dependentFiles = null)
        {
            return factory();
        }

        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, string[] dependentFiles = null)
        { }

        /// <inheritdoc />
@@ -60,7 +67,7 @@ namespace Umbraco.Core.Cache
        { }

        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
        { }

        /// <inheritdoc />
@@ -78,5 +85,9 @@ namespace Umbraco.Core.Cache
        /// <inheritdoc />
        public virtual void ClearByRegex(string regex)
        { }
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator() => new Dictionary<string, object>().GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
    }
 }
@@ -5,7 +5,7 @@ using Umbraco.Core.Models.Entities;

 namespace Umbraco.Core.Cache
 {
-    internal class NoCacheRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
+    public class NoCacheRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
        where TEntity : class, IEntity
    {
        private NoCacheRepositoryCachePolicy() { }
@@ -4,9 +4,7 @@ using System.Linq;
 using System.Runtime.Caching;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Web.Caching;
 using Umbraco.Core.Composing;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;

 namespace Umbraco.Core.Cache
 {
@@ -31,7 +29,7 @@ namespace Umbraco.Core.Cache
        /// <summary>
        /// Gets the internal memory cache, for tests only!
        /// </summary>
-        internal ObjectCache MemoryCache { get; private set; }
+        public ObjectCache MemoryCache { get; private set; }

        /// <inheritdoc />
        public object Get(string key)
@@ -47,7 +45,7 @@ namespace Umbraco.Core.Cache
                if (_locker.IsReadLockHeld)
                    _locker.ExitReadLock();
            }
-            return result == null ? null : FastDictionaryAppCacheBase.GetSafeLazyValue(result); // return exceptions as null
+            return result == null ? null : SafeLazy.GetSafeLazyValue(result); // return exceptions as null
        }

        /// <inheritdoc />
@@ -73,7 +71,7 @@ namespace Umbraco.Core.Cache
                    _locker.ExitReadLock();
            }
            return entries
-                .Select(x => FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }
@@ -97,13 +95,13 @@ namespace Umbraco.Core.Cache
                    _locker.ExitReadLock();
            }
            return entries
-                .Select(x => FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }

        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, string[] dependentFiles = null)
        {
            // see notes in HttpRuntimeAppCache

@@ -112,10 +110,10 @@ namespace Umbraco.Core.Cache
            using (var lck = new UpgradeableReadLock(_locker))
            {
                result = MemoryCache.Get(key) as Lazy<object>;
-                if (result == null || FastDictionaryAppCacheBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                if (result == null || SafeLazy.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+                    result = SafeLazy.GetSafeLazy(factory);
+                    var policy = GetPolicy(timeout, isSliding, dependentFiles);

                    lck.UpgradeToWriteLock();
                    //NOTE: This does an add or update
@@ -126,21 +124,21 @@ namespace Umbraco.Core.Cache
            //return result.Value;

            var value = result.Value; // will not throw (safe lazy)
-            if (value is FastDictionaryAppCacheBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            if (value is SafeLazy.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
            return value;
        }

        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, string[] dependentFiles = null)
        {
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
+            var result = SafeLazy.GetSafeLazy(factory);
            var value = result.Value; // force evaluation now
            if (value == null) return; // do not store null values (backward compat)

-            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            var policy = GetPolicy(timeout, isSliding, dependentFiles);
            //NOTE: This does an add or update
            MemoryCache.Set(key, result, policy);
        }
@@ -178,9 +176,8 @@ namespace Umbraco.Core.Cache
        }

        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
        {
-            var type = TypeFinder.GetTypeByName(typeName);
            if (type == null) return;
            var isInterface = type.IsInterface;
            try
@@ -192,7 +189,7 @@ namespace Umbraco.Core.Cache
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value, true);

                        // if T is an interface remove anything that implements that interface
                        // otherwise remove exact types (not inherited types)
@@ -223,7 +220,7 @@ namespace Umbraco.Core.Cache
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value, true);

                        // if T is an interface remove anything that implements that interface
                        // otherwise remove exact types (not inherited types)
@@ -255,7 +252,7 @@ namespace Umbraco.Core.Cache
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = SafeLazy.GetSafeLazyValue((Lazy<object>)x.Value, true);
                        if (value == null) return true;

                        // if T is an interface remove anything that implements that interface
@@ -314,7 +311,7 @@ namespace Umbraco.Core.Cache
            }
        }

-        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, string[] dependentFiles = null)
        {
            var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
            var sliding = isSliding == false ? ObjectCache.NoSlidingExpiration : (timeout ?? ObjectCache.NoSlidingExpiration);
@@ -330,34 +327,6 @@ namespace Umbraco.Core.Cache
                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
            }

-            if (removedCallback != null)
-            {
-                policy.RemovedCallback = arguments =>
-                {
-                    //convert the reason
-                    var reason = CacheItemRemovedReason.Removed;
-                    switch (arguments.RemovedReason)
-                    {
-                        case CacheEntryRemovedReason.Removed:
-                            reason = CacheItemRemovedReason.Removed;
-                            break;
-                        case CacheEntryRemovedReason.Expired:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.Evicted:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                        case CacheEntryRemovedReason.ChangeMonitorChanged:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.CacheSpecificEviction:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                    }
-                    //call the callback
-                    removedCallback(arguments.CacheItem.Key, arguments.CacheItem.Value, reason);
-                };
-            }
            return policy;
        }
    }
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Sync;

 namespace Umbraco.Core.Cache
@@ -9,29 +10,19 @@ namespace Umbraco.Core.Cache
    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
    /// <typeparam name="TPayload">The payload type.</typeparam>
    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class PayloadCacheRefresherBase<TInstanceType, TPayload> : JsonCacheRefresherBase<TInstanceType>, IPayloadCacheRefresher<TPayload>
+    public abstract class PayloadCacheRefresherBase<TInstanceType, TPayload> : JsonCacheRefresherBase<TInstanceType, TPayload>, IPayloadCacheRefresher<TPayload>
        where TInstanceType : class, ICacheRefresher
    {
+
        /// <summary>
        /// Initializes a new instance of the <see cref="PayloadCacheRefresherBase{TInstanceType, TPayload}"/>.
        /// </summary>
        /// <param name="appCaches">A cache helper.</param>
-        protected PayloadCacheRefresherBase(AppCaches appCaches) : base(appCaches)
-        { }
-
-        #region Json
-
-        /// <summary>
-        /// Deserializes a json payload into an object payload.
-        /// </summary>
-        /// <param name="json">The json payload.</param>
-        /// <returns>The deserialized object payload.</returns>
-        protected virtual TPayload[] Deserialize(string json)
+        /// <param name="serializer"></param>
+        protected PayloadCacheRefresherBase(AppCaches appCaches, IJsonSerializer serializer) : base(appCaches, serializer)
        {
-            return JsonConvert.DeserializeObject<TPayload[]>(json);
        }

-        #endregion

        #region Refresher

@@ -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
@@ -0,0 +1,63 @@
+using System;
+using System.Runtime.ExceptionServices;
+
+namespace Umbraco.Core.Cache
+{
+    public static class SafeLazy
+    {
+        // an object that represent a value that has not been created yet
+        internal static readonly object ValueNotCreated = new object();
+
+        public static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
+        {
+            // try to generate the value and if it fails,
+            // wrap in an ExceptionHolder - would be much simpler
+            // to just use lazy.IsValueFaulted alas that field is
+            // internal
+            return new Lazy<object>(() =>
+            {
+                try
+                {
+                    return getCacheItem();
+                }
+                catch (Exception e)
+                {
+                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
+                }
+            });
+        }
+
+        public static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            // if onlyIfValueIsCreated, do not trigger value creation
+            // must return something, though, to differentiate from null values
+            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+
+            // if execution has thrown then lazy.IsValueCreated is false
+            // and lazy.IsValueFaulted is true (but internal) so we use our
+            // own exception holder (see Lazy<T> source code) to return null
+            if (lazy.Value is ExceptionHolder) return null;
+
+            // we have a value and execution has not thrown so returning
+            // here does not throw - unless we're re-entering, take care of it
+            try
+            {
+                return lazy.Value;
+            }
+            catch (InvalidOperationException e)
+            {
+                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
+            }
+        }
+
+        public class ExceptionHolder
+        {
+            public ExceptionHolder(ExceptionDispatchInfo e)
+            {
+                Exception = e;
+            }
+
+            public ExceptionDispatchInfo Exception { get; }
+        }
+    }
+}
@@ -8,13 +8,13 @@ namespace Umbraco.Web.Cache
 {
    public sealed class TemplateCacheRefresher : CacheRefresherBase<TemplateCacheRefresher>
    {
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;
        private readonly IContentTypeCommonRepository _contentTypeCommonRepository;

-        public TemplateCacheRefresher(AppCaches appCaches, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository)
+        public TemplateCacheRefresher(AppCaches appCaches, IIdKeyMap idKeyMap, IContentTypeCommonRepository contentTypeCommonRepository)
            : base(appCaches)
        {
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
            _contentTypeCommonRepository = contentTypeCommonRepository;
        }

@@ -55,7 +55,7 @@ namespace Umbraco.Web.Cache

        private void RemoveFromCache(int id)
        {
-            _idkMap.ClearCache(id);
+            _idKeyMap.ClearCache(id);
            AppCaches.RuntimeCache.Clear($"{CacheKeys.TemplateFrontEndCacheKey}{id}");

            //need to clear the runtime cache for templates
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Cache
            var userGroupCache = AppCaches.IsolatedCaches.Get<IUserGroup>();
            if (userGroupCache)
            {
-                userGroupCache.Result.ClearByKey(UserGroupRepository.GetByAliasCacheKeyPrefix);
+                userGroupCache.Result.ClearByKey(CacheKeys.UserGroupGetByAliasCacheKeyPrefix);
            }

            //We'll need to clear all user cache too
@@ -59,7 +59,7 @@ namespace Umbraco.Web.Cache
            if (userGroupCache)
            {
                userGroupCache.Result.Clear(RepositoryCacheKeys.GetKey<IUserGroup>(id));
-                userGroupCache.Result.ClearByKey(UserGroupRepository.GetByAliasCacheKeyPrefix);
+                userGroupCache.Result.ClearByKey(CacheKeys.UserGroupGetByAliasCacheKeyPrefix);
            }

            //we don't know what user's belong to this group without doing a look up so we'll need to just clear them all
--- a/Show More
+++ b/Show More