fixes datepicker css ref issue

fixes media dialog sync issues
Adds value convertor for rel links
2013-11-21 12:15:20 +01:00 · 2013-11-21 12:15:03 +01:00 · 2013-11-21 11:48:07 +01:00 · 2013-11-21 11:27:34 +01:00 · 2013-11-21 11:24:46 +01:00 · 2013-11-21 11:17:43 +01:00
3472 changed files with 277533 additions and 101705 deletions
@@ -1,86 +1,108 @@
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-_BuildOutput/*
-build/UmbracoCms.AllBinaries*zip
-build/UmbracoCms.WebPI*zip
-build/UmbracoCms*zip
-build/*.nupkg
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-*.orig
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-webpihash.txt
-
-node_modules
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-build/_BuildOutput/
-tools/NDepend/
-src/*.vspx
-src/*.psess
-NDependOut/*
-QueryResult.htm
-*.ndproj
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+.DS_Store
+._.DS_Store
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_BuildOutput/*
+*.ncrunchsolution
+build/UmbracoCms.AllBinaries*zip
+build/UmbracoCms.WebPI*zip
+build/UmbracoCms*zip
+build/*.nupkg
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+*.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+tools/NDepend/
+
+src/Umbraco.Web.UI/App_Plugins/*
+src/*.psess
+src/*.vspx
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
+NDependOut/*
+*.ndproj
+QueryResult.htm
+*.ndproj
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+
+src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
+src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
+src/Umbraco.Web.UI/umbraco/plugins/*
@@ -1,9 +1,9 @@
-# The MIT License (MIT) #
-
-Copyright (c) 2013 Umbraco
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,33 +1,36 @@
-Umbraco CMS
-===========
-## Watch a five minute introduction video ##
-
-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
-
-## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
-
-**More than 177,000 sites trust Umbraco** 
-
-For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
-
-Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
-
-To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
-
-## Downloading ##
-
-The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
-
-## Forums ##
-
-We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
-
-## Contribute to Umbraco ##
-
-If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
-
-## Found a bug? ##
-
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
-
-To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
+Umbraco CMS
+===========
+##Note: Building version 7 from source##
+If you're interested in using the source code and building version 7, make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
+
+## Watch a five minute introduction video ##
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+
+**More than 177,000 sites trust Umbraco** 
+
+For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+
+To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+
+## Downloading ##
+
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+
+## Forums ##
+
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+
+## Contribute to Umbraco ##
+
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+
+## Found a bug? ##
+
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
@@ -1,33 +1,34 @@
-@ECHO OFF
-SET release=6.1.6
-SET comment=
-SET version=%release%
-
-IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
-
-ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
-
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
-
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
-
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
-
-IF ERRORLEVEL 1 GOTO :showerror
-
-GOTO :EOF
-
-:showerror
-PAUSE
+@ECHO OFF
+SET release=7.0.0
+SET comment=
+SET version=%release%
+
+IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
+
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
+
+ren .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
+ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
+
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
+
+IF ERRORLEVEL 1 GOTO :showerror
+
+GOTO :EOF
+
+:showerror
+PAUSE
@@ -162,10 +162,21 @@
    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
  </Target>

-  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
    <MakeDir Directories="@(SystemFolders)" />
  </Target>

+  <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
+    <ItemGroup>
+      <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
+    </ItemGroup>	
+	
+	<Copy SourceFiles="@(BelleFiles)"
+        DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+  </Target>
+  
  <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
    <!-- Copy SQL CE -->
    <ItemGroup>
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms.Core</id>
-        <version>6.2.0</version>
+        <version>7.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -15,9 +15,11 @@
        <language>en-US</language>
        <tags>umbraco</tags>
        <dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="4.0" />
-            <dependency id="Microsoft.AspNet.WebApi" version="4.0" />
+            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[4.0.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.0, 5.0.0)" />
            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+            <dependency id="Microsoft.Net.Http" version="[2.0.0, 3.0.0)" />
            <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
            <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
@@ -26,6 +28,8 @@
            <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
            <dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
+            <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
        </dependencies>
    </metadata>
    <files>
@@ -58,8 +62,6 @@
        <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
-        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
-        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
        <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
        <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms</id>
-        <version>6.1.2</version>
+        <version>7.0.0</version>
        <title>Umbraco Cms</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -23,7 +23,7 @@
 	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
-	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
+	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
@@ -1,14 +1,14 @@
-<?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>
+<?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,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -1,14 +1,14 @@
-<?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>
+<?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,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -1,14 +1,14 @@
-<?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>
+<?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,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
@@ -21,7 +21,7 @@ if ($project) {
 	$projectDestinationPath = Split-Path $project.FullName -Parent
 	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
 	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
-	
+		
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }
@@ -1,31 +0,0 @@
-/*******************************************************************************************
-
-    Umbraco database installation script for SQL CE (upgrade from Umbraco 4.0.x)
- 
-	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
- 
-    Database version: 4.8.0.0
-    
-    Please increment this version number if ANY change is made to this script,
-    so compatibility with scripts for other database systems can be verified easily.
-    The first 3 digits depict the Umbraco version, the last digit is the database version.
-    (e.g. version 4.0.0.3 means "Umbraco version 4.0.0, database version 3")
-    
-    Check-in policy: only commit this script if
-     * you ran the Umbraco installer completely;
-     * you ran it on the targetted database system;
-     * you ran the Runway and Module installations;
-     * you were able to browse the Boost site;
-     * you were able to open the Umbraco administration panel;
-     * you have documented the code change in this script;
-     * you have incremented the version number in this script.
- 
-	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
-
-********************************************************************************************/
-
-/* REMOVE CONSTRAINTS */
-ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoApp] 
-;
-ALTER TABLE [umbracoAppTree] DROP CONSTRAINT [FK_umbracoAppTree_umbracoApp] 
-;
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SQLCE4Umbraco</RootNamespace>
    <AssemblyName>SQLCE4Umbraco</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -22,6 +22,7 @@
    </SccProvider>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -31,6 +32,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -40,6 +42,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -70,25 +73,11 @@
    <Compile Include="SqlCEInstaller.cs" />
    <Compile Include="SqlCEParameter.cs" />
    <Compile Include="SqlCeProviderException.cs" />
-    <Compile Include="SqlCEResources1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>SqlCEResources.resx</DependentUpon>
-    </Compile>
    <Compile Include="SqlCETableUtility.cs" />
    <Compile Include="SqlCEUtility.cs" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="Sql\Total.sql" />
    <None Include="packages.config" />
-    <None Include="Sql\Version4_1_Upgrade.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SqlCEResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>SqlCEResources1.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
@@ -17,6 +17,7 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Database installer for an SQL Server data source.
    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
    {
        #region Private Constants
@@ -97,7 +98,7 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string FullInstallSql
 		{
-			get { return SqlCEResources.Total; }
+			get { return string.Empty; }
 		}


@@ -106,11 +107,7 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string UpgradeSql
 		{
-			get
-			{
-				string upgradeFile = string.Format("{0}_Upgrade", CurrentVersion.ToString());
-				return SqlCEResources.ResourceManager.GetString(upgradeFile);
-			}
+			get { return string.Empty; }
 		}

        // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
@@ -11,6 +11,7 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// SQL Server implementation of <see cref="DefaultTableUtility&lt;S&gt;"/>.
    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCETableUtility : DefaultTableUtility<SqlCEHelper>
    {
        /// <summary>
@@ -6,6 +6,7 @@
 * 
 ***********************************************************************************/

+using System;
 using umbraco.DataLayer.SqlHelpers.SqlServer;
 using umbraco.DataLayer.Utility;
 using umbraco.DataLayer.Utility.Installer;
@@ -16,6 +17,7 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Utility for an SQL Server data source.
    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEUtility : DefaultUtility<SqlCEHelper>
    {
        #region Public Constructors
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
@@ -33,6 +34,17 @@ namespace Umbraco.Core
 			}
 		}

+        /// <summary>
+        /// Gets an Action if it exists.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        internal IAction GetAction<T>()
+            where T : IAction
+        {
+            return Actions.SingleOrDefault(x => x.GetType() == typeof (T));
+        }
+
 		protected override IEnumerable<IAction> CreateInstances()
 		{					
 			var actions = new List<IAction>();
@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.Caching;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Services;
@@ -20,52 +21,81 @@ namespace Umbraco.Core
    /// </remarks>
    public class ApplicationContext : IDisposable
    {
-    	/// <summary>
-        /// Constructor
-        /// </summary>        
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
-            : this(dbContext, serviceContext, true)
-    	{
-    			
-    	}
-
+        
        /// <summary>
        /// Constructor
        /// </summary>
        /// <param name="dbContext"></param>
        /// <param name="serviceContext"></param>
-        /// <param name="enableCache"></param>
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, bool enableCache)
-            : this(enableCache)
+        /// <param name="cache"></param>
+        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
        {
            if (dbContext == null) throw new ArgumentNullException("dbContext");
            if (serviceContext == null) throw new ArgumentNullException("serviceContext");
-
+            if (cache == null) throw new ArgumentNullException("cache");
            _databaseContext = dbContext;
-            _services = serviceContext;		
+            _services = serviceContext;
+            ApplicationCache = cache;
        }

-		/// <summary>
-		/// Empty constructor normally reserved for unit tests when a DatabaseContext or a ServiceContext is not
-		/// necessarily required or needs to be set after construction.
-		/// </summary>
-		internal ApplicationContext() : this(true)
-		{			
-		}
-
        /// <summary>
-        /// Constructor used to specify if we will enable application cache or not
+        /// Creates a basic app context
        /// </summary>
-        /// <param name="enableCache"></param>
-        internal ApplicationContext(bool enableCache)
+        /// <param name="cache"></param>
+        public ApplicationContext(CacheHelper cache)
        {
-            //create a new application cache from the HttpRuntime.Cache
-            ApplicationCache = HttpRuntime.Cache == null
-                ? new CacheHelper(new System.Web.Caching.Cache(), enableCache)
-                : new CacheHelper(HttpRuntime.Cache, enableCache);
+            ApplicationCache = cache;
        }

-		/// <summary>
+	    /// <summary>
+	    /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
+	    /// </summary>
+	    /// <param name="appContext">
+	    /// The instance to set on the global application singleton
+	    /// </param>
+	    /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This is NOT thread safe 
+	    /// </remarks>
+	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
+	    {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            ApplicationContext.Current = appContext;
+            return ApplicationContext.Current;
+	    }
+
+	    /// <summary>
+	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    /// <param name="replaceContext">
+	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
+	    /// startup if for some reason the boot manager is not the umbraco boot manager.
+	    /// </param>
+	    /// <param name="dbContext"></param>
+	    /// <param name="serviceContext"></param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This is NOT thread safe 
+	    /// </remarks>
+	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
+        {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
+            ApplicationContext.Current = ctx;
+            return ApplicationContext.Current;
+        }
+
+	    /// <summary>
    	/// Singleton accessor
    	/// </summary>
    	public static ApplicationContext Current { get; internal set; }
@@ -82,7 +112,7 @@ namespace Umbraco.Core
        // note - the original umbraco module checks on content.Instance in umbraco.dll
        //   now, the boot task that setup the content store ensures that it is ready
        bool _isReady = false;
-		readonly System.Threading.ManualResetEventSlim _isReadyEvent = new System.Threading.ManualResetEventSlim(false);
+		readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
 		private DatabaseContext _databaseContext;
 		private ServiceContext _services;

@@ -112,18 +142,18 @@ namespace Umbraco.Core
        //   the system is configured if they match
        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
        //
-        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it...
+        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
        //
        public bool IsConfigured
        {
-            // fixme - let's do this for the time being
+            // todo - we should not do this - ok for now
            get
            {
            	return Configured;
            }
        }

-        /// <summary>
+	    /// <summary>
        /// The original/first url that the web application executes
        /// </summary>
        /// <remarks>
@@ -2,65 +2,165 @@ using System;

 namespace Umbraco.Core
 {
-	/// <summary>
-	/// Represents the result of an operation attempt
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	/// <remarks></remarks>
-	[Serializable]
-	public struct Attempt<T>
-	{
-		private readonly bool _success;
-		private readonly T _result;
-		private readonly Exception _error;
+    /// <summary>
+    /// Provides ways to create attempts.
+    /// </summary>
+    public static class Attempt
+    {
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed<T>(T result)
+        {
+            return Attempt<T>.Succeed(result);
+        }

-		/// <summary>
-		/// Gets a value indicating whether this <see cref="Attempt{T}"/> represents a successful operation.
-		/// </summary>
-		/// <remarks></remarks>
-		public bool Success
-		{
-			get { return _success; }
-		}
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail<T>(T result)
+        {
+            return Attempt<T>.Fail(result);
+        }

-		/// <summary>
-		/// Gets the error associated with an unsuccessful attempt.
-		/// </summary>
-		/// <value>The error.</value>
-		public Exception Error { get { return _error; } }
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail<T>(T result, Exception exception)
+        {
+            return Attempt<T>.Fail(result, exception);
+        }

-		/// <summary>
-		/// Gets the parse result.
-		/// </summary>
-		/// <remarks></remarks>
-		public T Result
-		{
-			get { return _result; }
-		}
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> If<T>(bool success, T result)
+        {
+            return Attempt<T>.SucceedIf(success, result);
+        }

-		/// <summary>
-		/// Represents an unsuccessful parse operation
-		/// </summary>
-		public static readonly Attempt<T> False = new Attempt<T>(false, default(T));

-		/// <summary>
-		/// Initializes a new instance of the <see cref="Attempt{T}"/> struct.
-		/// </summary>
-		/// <param name="success">If set to <c>true</c> this tuple represents a successful parse result.</param>
-		/// <param name="result">The parse result.</param>
-		/// <remarks></remarks>
-		public Attempt(bool success, T result)
-		{
-			_success = success;
-			_result = result;
-			_error = null;
-		}
+        /// <summary>
+        /// Executes an attempt function, with callbacks.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="attempt">The attempt returned by the attempt function.</param>
+        /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+        /// <param name="onFail">An action to execute in case the attempt fails.</param>
+        /// <returns>The outcome of the attempt.</returns>
+        /// <remarks>Runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+        /// whether the attempt function reports a success or a failure.</remarks>
+        public static Outcome Try<T>(Attempt<T> attempt, Action<T> onSuccess, Action<Exception> onFail = null)
+        {
+            if (attempt.Success)
+            {
+                onSuccess(attempt.Result);
+                return Outcome.Success;
+            }

-		public Attempt(Exception error)
-		{
-			_success = false;
-			_result = default(T);
-			_error = error;
-		}
-	}
+            if (onFail != null)
+            {
+                onFail(attempt.Exception);
+            }
+
+            return Outcome.Failure;
+        }
+
+        /// <summary>
+        /// Represents the outcome of an attempt.
+        /// </summary>
+        /// <remarks>Can be a success or a failure, and allows for attempts chaining.</remarks>
+        public struct Outcome
+        {
+            private readonly bool _success;
+
+            /// <summary>
+            /// Gets an outcome representing a success.
+            /// </summary>
+            public static readonly Outcome Success = new Outcome(true);
+
+            /// <summary>
+            /// Gets an outcome representing a failure.
+            /// </summary>
+            public static readonly Outcome Failure = new Outcome(false);
+
+            private Outcome(bool success)
+            {
+                _success = success;
+            }
+
+            /// <summary>
+            /// Executes another attempt function, if the previous one failed, with callbacks.
+            /// </summary>
+            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
+            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+            /// <param name="onFail">An action to execute in case the attempt fails.</param>
+            /// <returns>If it executes, returns the outcome of the attempt, else returns a success outcome.</returns>
+            /// <remarks>
+            /// <para>Executes only if the previous attempt failed, else does not execute and return a success outcome.</para>
+            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+            /// whether the attempt function reports a success or a failure.</para>
+            /// </remarks>
+            public Outcome OnFailure<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                return _success
+                    ? Success
+                    : ExecuteNextFunction(nextFunction, onSuccess, onFail);
+            }
+
+            /// <summary>
+            /// Executes another attempt function, if the previous one succeeded, with callbacks.
+            /// </summary>
+            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
+            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+            /// <param name="onFail">An action to execute in case the attempt fails.</param>
+            /// <returns>If it executes, returns the outcome of the attempt, else returns a failed outcome.</returns>
+            /// <remarks>
+            /// <para>Executes only if the previous attempt succeeded, else does not execute and return a success outcome.</para>
+            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+            /// whether the attempt function reports a success or a failure.</para>
+            /// </remarks>
+            public Outcome OnSuccess<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                return _success
+                    ? ExecuteNextFunction(nextFunction, onSuccess, onFail) 
+                    : Failure;
+            }
+
+            private static Outcome ExecuteNextFunction<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                var attempt = nextFunction();
+
+                if (attempt.Success)
+                {
+                    onSuccess(attempt.Result);
+                    return Success;
+                }
+
+                if (onFail != null)
+                {
+                    onFail(attempt.Exception);
+                }
+
+                return Failure;
+            }
+        }
+
+    }
 }
@@ -0,0 +1,164 @@
+using System;
+using Umbraco.Core.Dynamics;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+    [Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _exception;
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
+        /// </summary>
+        public bool Success
+		{
+			get { return _success; }
+		}
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
+        public Exception Error { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public T Result
+		{
+			get { return _result; }
+		}
+
+        // optimize, use a singleton failed attempt
+		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
+
+        /// <summary>
+        /// Represents an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
+        public static readonly Attempt<T> False = Failed; 
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, T result, Exception exception)
+        {
+            _success = success;
+            _result = result;
+            _exception = exception;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
+        /// </summary>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(bool success, T result)
+            : this(success, result, null)
+        { }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(Exception exception)
+            : this(false, default(T), exception)
+        { }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed()
+        {
+            return new Attempt<T>(true, default(T), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed(T result)
+        {
+            return new Attempt<T>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(Exception exception)
+        {
+            return new Attempt<T>(false, default(T), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result)
+        {
+            return new Attempt<T>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result, Exception exception)
+        {
+            return new Attempt<T>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition)
+        {
+            return condition ? new Attempt<T>(true, default(T), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition, T result)
+        {
+            return new Attempt<T>(condition, result, null);
+        }
+    }
+}
@@ -47,6 +47,5 @@ namespace Umbraco.Core.Cache
        public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";

        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
-
    }
 }
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a basic cache provider
-    /// </summary>
-    /// <remarks>
-    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
-    /// </remarks>
-    internal abstract class CacheProviderBase
-    {
-        public abstract void ClearAllCache();
-        public abstract void ClearCacheItem(string key);
-        public abstract void ClearCacheObjectTypes(string typeName);
-        public abstract void ClearCacheObjectTypes<T>();
-        public abstract void ClearCacheByKeySearch(string keyStartsWith);
-        public abstract void ClearCacheByKeyExpression(string regexString);
-        public abstract IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith);
-        public abstract T GetCacheItem<T>(string cacheKey);
-        public abstract T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem);
-    }
-}
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Extensions for strongly typed access
+    /// </summary>
+    internal static class CacheProviderExtensions
+    {
+        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            return result == null ? default(T) : result.TryConvertTo<T>().Result;
+        }
+
+        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
+        {
+            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
+        {
+            var result = provider.GetCacheItem(cacheKey);
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+    }
+}
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+
+namespace Umbraco.Core.Cache
+{
+    internal abstract class DictionaryCacheProdiverBase : ICacheProvider
+    {
+        protected static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        protected abstract DictionaryCacheWrapper DictionaryCache { get; }
+
+        /// <summary>
+        /// Clears everything in umbraco's runtime cache
+        /// </summary>
+        /// <remarks>
+        /// Does not clear other stuff the user has put in httpruntime.cache!
+        /// </remarks>
+        public virtual void ClearAllCache()
+        {
+            using (new WriteLock(Locker))
+            {
+                var keysToRemove = DictionaryCache.Cast<object>()
+                                                  .Select(item => new DictionaryItemWrapper(item))
+                                                  .Where(c => c.Key is string && ((string)c.Key).StartsWith(CacheItemPrefix) && DictionaryCache[c.Key.ToString()] != null)
+                                                  .Select(c => c.Key)
+                                                  .ToList();
+
+                foreach (var k in keysToRemove)
+                {
+                    DictionaryCache.Remove(k);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key 
+        /// </summary>
+        /// <param name="key">Key</param>
+        public virtual void ClearCacheItem(string key)
+        {
+            using (new WriteLock(Locker))
+            {
+                if (DictionaryCache[GetCacheKey(key)] == null) return;
+                DictionaryCache.Remove(GetCacheKey(key)); ;
+            }
+        }
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            using (new WriteLock(Locker))
+            {
+                var keysToRemove = DictionaryCache
+                    .Cast<object>()
+                    .Select(item => new DictionaryItemWrapper(item))
+                    .Where(c =>
+                    {
+                        var k = c.Key.ToString();
+                        var v = DictionaryCache[k];
+                        return v != null && v.GetType().ToString().InvariantEquals(typeName);
+                    })
+                    .Select(c => c.Key)
+                    .ToList();
+
+                foreach (var k in keysToRemove)
+                    DictionaryCache.Remove(k);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            using (new WriteLock(Locker))
+            {
+                var typeOfT = typeof(T);
+                var keysToRemove = DictionaryCache
+                    .Cast<object>()
+                    .Select(item => new DictionaryItemWrapper(item))
+                    .Where(c =>
+                    {
+                        var k = c.Key.ToString();
+                        var v = DictionaryCache[k];
+                        return v != null && v.GetType() == typeOfT;
+                    })
+                    .Select(c => c.Key)
+                    .ToList();
+
+                foreach (var k in keysToRemove)
+                    DictionaryCache.Remove(k);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            using (new WriteLock(Locker))
+            {
+                var typeOfT = typeof(T);
+                var keysToRemove = DictionaryCache
+                    .Cast<object>()
+                    .Select(item => new DictionaryItemWrapper(item))
+                    .Where(c =>
+                    {
+                        var k = c.Key.ToString();
+                        var v = DictionaryCache[k];
+                        return v != null && v.GetType() == typeOfT && predicate(k, (T)v);
+                    })
+                    .Select(c => c.Key)
+                    .ToList();
+
+                foreach (var k in keysToRemove)
+                    DictionaryCache.Remove(k);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            var keysToRemove = DictionaryCache.Cast<object>()
+                                              .Select(item => new DictionaryItemWrapper(item))
+                                              .Where(c => c.Key is string && ((string)c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith)))
+                                              .Select(c => c.Key)
+                                              .ToList();
+
+            foreach (var k in keysToRemove)
+            {
+                DictionaryCache.Remove(k);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            var keysToRemove = new List<object>();
+            foreach (var item in DictionaryCache)
+            {
+                var c = new DictionaryItemWrapper(item);
+                var s = c.Key as string;
+                if (s != null)
+                {
+                    var withoutPrefix = s.TrimStart(string.Format("{0}-", CacheItemPrefix));
+                    if (Regex.IsMatch(withoutPrefix, regexString))
+                    {
+                        keysToRemove.Add(c.Key);
+                    }
+                }
+            }
+
+            foreach (var k in keysToRemove)
+            {
+                DictionaryCache.Remove(k);
+            }
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from object item in DictionaryCache
+                    select new DictionaryItemWrapper(item)
+                    into c
+                    where c.Key is string && ((string) c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith))
+                    select c.Value).ToList();
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            var result = DictionaryCache.Get(GetCacheKey(cacheKey));
+            return result;
+        }
+
+        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);        
+
+        /// <summary>
+        /// We prefix all cache keys with this so that we know which ones this class has created when 
+        /// using the HttpRuntime cache so that when we clear it we don't clear other entries we didn't create.
+        /// </summary>
+        protected const string CacheItemPrefix = "umbrtmche";
+
+        protected string GetCacheKey(string key)
+        {
+            return string.Format("{0}-{1}", CacheItemPrefix, key);
+        }
+    }
+}
@@ -0,0 +1,45 @@
+using System;
+using System.Collections;
+
+namespace Umbraco.Core.Cache
+{
+    internal class DictionaryCacheWrapper : IEnumerable
+    {
+        private readonly IEnumerable _inner;
+        private readonly Func<object, object> _get;
+        private readonly Action<object> _remove;
+
+        public DictionaryCacheWrapper(
+            IEnumerable inner,
+            Func<object, object> get,
+            Action<object> remove)
+        {
+            _inner = inner;
+            _get = get;
+            _remove = remove;
+        }
+
+        public object this[object key]
+        {
+            get
+            {
+                return Get(key);
+            }            
+        }
+
+        public object Get(object key)
+        {
+            return _get(key);
+        }
+
+        public void Remove(object key)
+        {
+            _remove(key);
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return _inner.GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Cache
+{
+    internal class DictionaryItemWrapper
+    {
+        public DictionaryItemWrapper(dynamic item)
+        {
+            Key = item.Key;
+            Value = item.Value;
+        }
+        
+        public object Key { get; private set; }
+        public object Value { get; private set; }
+    }
+}
@@ -0,0 +1,47 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that caches items in the HttpContext.Items
+    /// </summary>
+    internal class HttpRequestCacheProvider : DictionaryCacheProdiverBase
+    {
+        private readonly Func<HttpContextBase> _context;
+
+        public HttpRequestCacheProvider(HttpContext context)
+        {
+            _context = () => new HttpContextWrapper(context);
+        }
+
+        public HttpRequestCacheProvider(Func<HttpContextBase> context)
+        {
+            _context = context;
+        }
+
+        protected override DictionaryCacheWrapper DictionaryCache
+        {
+            get
+            {
+                var ctx = _context();
+                return new DictionaryCacheWrapper(
+                    ctx.Items,
+                    o => ctx.Items[o],
+                    o => ctx.Items.Remove(o));
+            }
+        }
+
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            var ctx = _context();
+            var ck = GetCacheKey(cacheKey);
+            return ctx.Items[ck] ?? (ctx.Items[ck] = getCacheItem());
+        }
+
+    }
+}
@@ -1,62 +1,37 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Threading;
+using System.Web;
 using System.Web.Caching;
 using Umbraco.Core.Logging;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
    /// </summary>
-    internal class HttpRuntimeCacheProvider : RuntimeCacheProviderBase
+    internal class HttpRuntimeCacheProvider : DictionaryCacheProdiverBase, IRuntimeCacheProvider
    {
        private readonly System.Web.Caching.Cache _cache;
-        private static readonly object Locker = new object();
-
+        private readonly DictionaryCacheWrapper _wrapper;
+        
        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
        {
            _cache = cache;
+            _wrapper = new DictionaryCacheWrapper(_cache, s => _cache.Get(s.ToString()), o => _cache.Remove(o.ToString()));
        }

-        /// <summary>
-        /// Clears everything in umbraco's runtime cache, which means that not only
-        /// umbraco content is removed, but also other cache items from pages running in
-        /// the same application / website. Use with care :-)
-        /// </summary>
-        public override void ClearAllCache()
+        protected override DictionaryCacheWrapper DictionaryCache
        {
-            var cacheEnumerator = _cache.GetEnumerator();
-            while (cacheEnumerator.MoveNext())
-            {
-                _cache.Remove(cacheEnumerator.Key.ToString());
-            }
+            get { return _wrapper; }
        }

        /// <summary>
-        /// Clears the item in umbraco's runtime cache with the given key 
+        /// Clears all objects in the System.Web.Cache with the System.Type specified that satisfy the predicate
        /// </summary>
-        /// <param name="key">Key</param>
-        public override void ClearCacheItem(string key)
-        {
-            // NH 10 jan 2012
-            // Patch by the always wonderful Stéphane Gay to avoid cache null refs
-            lock (Locker)
-            {
-                if (_cache[key] == null) return;
-                _cache.Remove(key); ;
-            }
-        }
-
-
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type name as the
-        /// input parameter. (using [object].GetType())
-        /// </summary>
-        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        public override void ClearCacheObjectTypes(string typeName)
+        public override void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
        {
            try
            {
@@ -64,8 +39,10 @@ namespace Umbraco.Core.Cache
                {
                    foreach (DictionaryEntry c in _cache)
                    {
-                        if (_cache[c.Key.ToString()] != null
-                            && _cache[c.Key.ToString()].GetType().ToString().InvariantEquals(typeName))
+                        var key = c.Key.ToString();
+                        if (_cache[key] != null
+                            && _cache[key] is T
+                            && predicate(key, (T)_cache[key]))
                        {
                            _cache.Remove(c.Key.ToString());
                        }
@@ -78,279 +55,94 @@ namespace Umbraco.Core.Cache
            }
        }

-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type specified
-        /// </summary>
-        public override void ClearCacheObjectTypes<T>()
-        {
-            try
-            {
-                lock (Locker)
-                {
-                    foreach (DictionaryEntry c in _cache)
-                    {
-                        if (_cache[c.Key.ToString()] != null
-                            && _cache[c.Key.ToString()].GetType() == typeof(T))
-                        {
-                            _cache.Remove(c.Key.ToString());
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error<CacheHelper>("Cache clearing error", e);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        public override void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            foreach (DictionaryEntry c in _cache)
-            {
-                if (c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith))
-                {
-                    ClearCacheItem((string)c.Key);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        public override void ClearCacheByKeyExpression(string regexString)
-        {
-            foreach (DictionaryEntry c in _cache)
-            {
-                if (c.Key is string && Regex.IsMatch(((string)c.Key), regexString))
-                {
-                    ClearCacheItem((string)c.Key);
-                }
-            }
-        }
-
-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
-        {
-            return (from DictionaryEntry c in _cache
-                    where c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith)
-                    select c.Value.TryConvertTo<T>()
-                    into attempt
-                    where attempt.Success
-                    select attempt.Result).ToList();
-        }
-
-        /// <summary>
-        /// Returns a cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey)
-        {
-            var result = _cache.Get(cacheKey);
-            if (result == null)
-            {
-                return default(TT);
-            }
-            return result.TryConvertTo<TT>().Result;
-        }
-
-        /// <summary>
+        /// <summary>
        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
        /// </summary>
-        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
        {
-            return GetCacheItem(cacheKey, CacheItemPriority.Normal, null, null, null, getCacheItem, Locker);
+            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
        }

        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// This overload is here for legacy purposes
        /// </summary>
-        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            TimeSpan? timeout, Func<TT> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
-                                            Func<TT> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
-                                            Func<TT> getCacheItem)
+        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
        {
-            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
-        }
+            cacheKey = GetCacheKey(cacheKey);

-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            CacheItemPriority priority,
-                                            CacheItemRemovedCallback refreshAction,
-                                            CacheDependency cacheDependency,
-                                            TimeSpan? timeout,
-                                            Func<TT> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem, Locker);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <param name="syncLock"></param>
-        /// <returns></returns>
-        private TT GetCacheItem<TT>(string cacheKey,
-                                     CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
-                                     CacheDependency cacheDependency, TimeSpan? timeout, Func<TT> getCacheItem, object syncLock)
-        {
-            var result = _cache.Get(cacheKey);
-            if (result == null)
+            using (var lck = new UpgradeableReadLock(Locker))
            {
-                lock (syncLock)
+                var result = DictionaryCache.Get(cacheKey);
+                if (result == null)
                {
-                    result = _cache.Get(cacheKey);
-                    if (result == null)
-                    {
-                        result = getCacheItem();
-                        if (result != null)
-                        {
-                            //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
-                            _cache.Insert(cacheKey, result, cacheDependency,
-                                          timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
-                                          TimeSpan.Zero, priority, refreshAction);
-                        }
+                    lck.UpgradeToWriteLock();
+
+                    result = getCacheItem();
+                    if (result != null)
+                    {                        
+                        var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+                        var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+                        _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
                    }
+
                }
+                return result;
            }
-            return result.TryConvertTo<TT>().Result;
        }

-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                Func<T> getCacheItem)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
-            InsertCacheItem(cacheKey, priority, null, null, null, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            InsertCacheItem(cacheKey, priority, null, null, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                CacheDependency cacheDependency,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            InsertCacheItem(cacheKey, priority, null, cacheDependency, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                CacheItemRemovedCallback refreshAction,
-                                                CacheDependency cacheDependency,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            object result = getCacheItem();
-            if (result != null)
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
            {
-                //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
-                _cache.Insert(cacheKey, result, cacheDependency,
-                              timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
-                              TimeSpan.Zero, priority, refreshAction);
+                dependency = new CacheDependency(dependentFiles);
            }
+            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
        }

+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        {
+            var result = getCacheItem();
+            if (result == null) return;
+
+            cacheKey = GetCacheKey(cacheKey);           
+
+            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+            _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
    }
 }
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a basic cache provider
+    /// </summary>
+    public interface ICacheProvider
+    {
+        void ClearAllCache();
+        void ClearCacheItem(string key);
+        void ClearCacheObjectTypes(string typeName);
+        void ClearCacheObjectTypes<T>();
+        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+        void ClearCacheByKeySearch(string keyStartsWith);
+        void ClearCacheByKeyExpression(string regexString);
+        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        object GetCacheItem(string cacheKey);
+        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+    }
+}
@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.Caching;
+using System.Text;
+using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public interface IRuntimeCacheProvider : ICacheProvider
+    {
+        object GetCacheItem(
+            string cacheKey, 
+            Func<object> getCacheItem, 
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+        void InsertCacheItem(
+            string cacheKey,
+            Func<object> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+    }
+}
@@ -5,81 +5,62 @@ using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
-    internal class NullCacheProvider : RuntimeCacheProviderBase
+    internal class NullCacheProvider : IRuntimeCacheProvider
    {
-        public override void ClearAllCache()
+        public virtual void ClearAllCache()
        {
        }

-        public override void ClearCacheItem(string key)
+        public virtual void ClearCacheItem(string key)
        {
        }

-        public override void ClearCacheObjectTypes(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
        {
        }

-        public override void ClearCacheObjectTypes<T>()
+        public virtual void ClearCacheObjectTypes<T>()
        {
        }

-        public override void ClearCacheByKeySearch(string keyStartsWith)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
        {
        }

-        public override void ClearCacheByKeyExpression(string regexString)
+
+
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
        {
        }

-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        public virtual void ClearCacheByKeyExpression(string regexString)
        {
-            return Enumerable.Empty<T>();
        }

-        public override T GetCacheItem<T>(string cacheKey)
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
        {
-            return default(T);
+            return Enumerable.Empty<object>();
        }

-        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            return default(object);
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
        {
            return getCacheItem();
        }

-        public override T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
            return getCacheItem();
        }

-        public override T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
+            
        }
    }
 }
@@ -0,0 +1,213 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.Caching;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Web.Caching;
+using Umbraco.Core.Logging;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
+    /// </summary>
+    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
+    {
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        internal ObjectCache MemoryCache;
+
+        public ObjectCacheRuntimeCacheProvider()
+        {
+            MemoryCache = new MemoryCache("in-memory");
+        }
+
+        public virtual void ClearAllCache()
+        {
+            using (new WriteLock(Locker))
+            {
+                MemoryCache.DisposeIfDisposable();
+                MemoryCache = new MemoryCache("in-memory");
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            using (new WriteLock(Locker))
+            {
+                if (MemoryCache[key] == null) return;
+                MemoryCache.Remove(key);
+            }            
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            using (new WriteLock(Locker))
+            {
+                var keysToRemove = MemoryCache
+                    .Where(c => c.Value != null && c.Value.GetType().ToString().InvariantEquals(typeName))
+                    .Select(c => c.Key)
+                    .ToArray();
+                foreach (var k in keysToRemove)
+                    MemoryCache.Remove(k);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            using (new WriteLock(Locker))
+            {
+                var typeOfT = typeof (T);
+                var keysToRemove = MemoryCache
+                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT)
+                    .Select(c => c.Key)
+                    .ToArray();
+                foreach (var k in keysToRemove)
+                    MemoryCache.Remove(k);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            using (new WriteLock(Locker))
+            {
+                var typeOfT = typeof(T);
+                var keysToRemove = MemoryCache
+                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT && predicate(c.Key, (T)c.Value))
+                    .Select(c => c.Key)
+                    .ToArray();
+                foreach (var k in keysToRemove)
+                    MemoryCache.Remove(k);
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            using (new WriteLock(Locker))
+            {
+                var keysToRemove = (from c in MemoryCache where c.Key.InvariantStartsWith(keyStartsWith) select c.Key).ToList();
+                foreach (var k in keysToRemove)
+                {
+                    MemoryCache.Remove(k);
+                }
+            }            
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            using (new WriteLock(Locker))
+            {
+                var keysToRemove = (from c in MemoryCache where Regex.IsMatch(c.Key, regexString) select c.Key).ToList();
+                foreach (var k in keysToRemove)
+                {
+                    MemoryCache.Remove(k);
+                }
+            }     
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from c in MemoryCache
+                    where c.Key.InvariantStartsWith(keyStartsWith)
+                    select c.Value).ToList();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            var result = MemoryCache.Get(cacheKey);
+            return result;
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, getCacheItem, null);
+        }
+
+        public object GetCacheItem(
+            string cacheKey, 
+            Func<object> getCacheItem, 
+            TimeSpan? timeout, 
+            bool isSliding = false, 
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null, 
+            string[] dependentFiles = null)
+        {
+            using (var lck = new UpgradeableReadLock(Locker))
+            {
+                var result = MemoryCache.Get(cacheKey);
+                if (result == null)
+                {
+                    lck.UpgradeToWriteLock();
+
+                    result = getCacheItem();
+                    if (result != null)
+                    {
+                        var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+                        MemoryCache.Set(cacheKey, result, policy);
+                    }
+                }
+                return result;
+            }
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            object result = getCacheItem();
+            if (result != null)
+            {
+                var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+                MemoryCache.Set(cacheKey, result, policy);
+            }
+        }
+
+        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, 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);
+
+            var policy = new CacheItemPolicy
+            {
+                AbsoluteExpiration = absolute,
+                SlidingExpiration = sliding
+            };
+
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                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,24 +0,0 @@
-using System;
-using System.Text;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a runtime cache provider
-    /// </summary>
-    /// <remarks>
-    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, REQUEST CACHE, ETC...
-    /// </remarks>
-    internal abstract class RuntimeCacheProviderBase : CacheProviderBase
-    {
-        public abstract T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-    }
-}
@@ -10,92 +10,64 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// A cache provider that statically caches everything in an in memory dictionary
    /// </summary>
-    internal class StaticCacheProvider : CacheProviderBase
+    internal class StaticCacheProvider : ICacheProvider
    {
-        private readonly ConcurrentDictionary<string, object> _staticCache = new ConcurrentDictionary<string, object>();
+        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();

-        public override void ClearAllCache()
+        public virtual void ClearAllCache()
        {
-            _staticCache.Clear();
+            StaticCache.Clear();
        }

-        public override void ClearCacheItem(string key)
+        public virtual void ClearCacheItem(string key)
        {
            object val;
-            _staticCache.TryRemove(key, out val);
+            StaticCache.TryRemove(key, out val);
        }

-        public override void ClearCacheObjectTypes(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
        {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (_staticCache[key] != null
-                    && _staticCache[key].GetType().ToString().InvariantEquals(typeName))
-                {
-                    object val;
-                    _staticCache.TryRemove(key, out val);
-                }
-            }
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
        }

-        public override void ClearCacheObjectTypes<T>()
+        public virtual void ClearCacheObjectTypes<T>()
        {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (_staticCache[key] != null
-                    && _staticCache[key].GetType() == typeof(T))
-                {
-                    object val;
-                    _staticCache.TryRemove(key, out val);
-                }
-            }
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
        }

-        public override void ClearCacheByKeySearch(string keyStartsWith)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
        {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (key.InvariantStartsWith(keyStartsWith))
-                {
-                    ClearCacheItem(key);
-                }
-            }
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
        }

-        public override void ClearCacheByKeyExpression(string regexString)
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
        {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (Regex.IsMatch(key, regexString))
-                {
-                    ClearCacheItem(key);
-                }
-            }
+            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
        }

-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        public virtual void ClearCacheByKeyExpression(string regexString)
        {
-            return (from KeyValuePair<string, object> c in _staticCache
+            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString)); 
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
                    where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value.TryConvertTo<T>()
-                    into attempt
-                    where attempt.Success
-                    select attempt.Result).ToList();
+                    select c.Value).ToList();
        }

-        public override T GetCacheItem<T>(string cacheKey)
+        public virtual object GetCacheItem(string cacheKey)
        {
-            var result = _staticCache[cacheKey];
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
+            var result = StaticCache[cacheKey];
+            return result;
        }

-        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
        {
-            return (T)_staticCache.GetOrAdd(cacheKey, getCacheItem);
+            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
        }
        
    }
@@ -18,189 +18,124 @@ namespace Umbraco.Core
    public class CacheHelper
 	{
 	    private readonly bool _enableCache;
-        private readonly CacheProviderBase _staticCache;
-        private readonly CacheProviderBase _nullStaticCache = new NullCacheProvider();
-        private readonly RuntimeCacheProviderBase _httpCache;
-        private readonly RuntimeCacheProviderBase _nullHttpCache = new NullCacheProvider();
+	    private readonly ICacheProvider _requestCache;
+        private readonly ICacheProvider _nullRequestCache = new NullCacheProvider();
+        private readonly ICacheProvider _staticCache;
+        private readonly ICacheProvider _nullStaticCache = new NullCacheProvider();
+        private readonly IRuntimeCacheProvider _httpCache;
+        private readonly IRuntimeCacheProvider _nullHttpCache = new NullCacheProvider();

-		public CacheHelper(System.Web.Caching.Cache cache)
-            : this(cache, true)
-		{
-		}
-
-	    internal CacheHelper(System.Web.Caching.Cache cache, bool enableCache)
-            : this(new HttpRuntimeCacheProvider(cache), enableCache)
-	    {            
-	    }
-
-        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, bool enableCache)
-            : this(httpCacheProvider, new StaticCacheProvider(), enableCache)
+        /// <summary>
+        /// Creates a cache helper with disabled caches
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// Good for unit testing
+        /// </remarks>
+        public static CacheHelper CreateDisabledCacheHelper()
        {
+            return new CacheHelper(null, null, null, false);
        }

-        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, CacheProviderBase staticCacheProvider, bool enableCache)
+	    /// <summary>
+	    /// Initializes a new instance for use in the web
+	    /// </summary>
+	    public CacheHelper()
+	        : this(
+	            new HttpRuntimeCacheProvider(HttpRuntime.Cache),
+	            new StaticCacheProvider(),
+	            new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
+	    {
+	    }
+
+	    /// <summary>
+	    /// Initializes a new instance for use in the web
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    public CacheHelper(System.Web.Caching.Cache cache)
+	        : this(
+	            new HttpRuntimeCacheProvider(cache),
+	            new StaticCacheProvider(),
+	            new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
+	    {
+	    }
+
+	    /// <summary>
+        /// Initializes a new instance based on the provided providers
+        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider, 
+            ICacheProvider staticCacheProvider, 
+            ICacheProvider requestCacheProvider)
+            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, true)
+        {            
+        }
+
+        /// <summary>
+        /// Private ctor used for creating a disabled cache helper
+        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        /// <param name="enableCache"></param>
+        private CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider, 
+            bool enableCache)
        {
-            _httpCache = httpCacheProvider;
-            _staticCache = staticCacheProvider;
+            if (enableCache)
+            {
+                _httpCache = httpCacheProvider;
+                _staticCache = staticCacheProvider;
+                _requestCache = requestCacheProvider;
+            }
+            else
+            {
+                _httpCache = null;
+                _staticCache = null;
+                _requestCache = null;
+            }
+
            _enableCache = enableCache;
        }

-        #region Static cache
-
        /// <summary>
-        /// Clears the item in umbraco's static cache
+        /// Returns the current Request cache
        /// </summary>
-        internal void ClearAllStaticCache()
+        public ICacheProvider RequestCache
        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearAllCache();
-            }
-            else
-            {
-                _staticCache.ClearAllCache();
-            }
+            get { return _enableCache ? _requestCache : _nullRequestCache; }
        }

        /// <summary>
-        /// Clears the item in umbraco's static cache with the given key 
+        /// Returns the current Runtime cache
        /// </summary>
-        /// <param name="key">Key</param>
-        internal void ClearStaticCacheItem(string key)
+        public ICacheProvider StaticCache
        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheItem(key);
-            }
-            else
-            {
-                _staticCache.ClearCacheItem(key);
-            }
+            get { return _enableCache ? _staticCache : _nullStaticCache; }
        }

        /// <summary>
-        /// Clears all objects in the static cache with the System.Type name as the
-        /// input parameter. (using [object].GetType())
+        /// Returns the current Runtime cache
        /// </summary>
-        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        internal void ClearStaticCacheObjectTypes(string typeName)
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheObjectTypes(typeName);
-            }
-            else
-            {
-                _staticCache.ClearCacheObjectTypes(typeName);
-            }
-        }
+	    public IRuntimeCacheProvider RuntimeCache
+	    {
+	        get { return _enableCache ? _httpCache : _nullHttpCache; }
+	    }
+        
+	    #region Legacy Runtime/Http Cache accessors

-        /// <summary>
-        /// Clears all objects in the static cache with the System.Type specified
-        /// </summary>
-        internal void ClearStaticCacheObjectTypes<T>()
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheObjectTypes<T>();
-            }
-            else
-            {
-                _staticCache.ClearCacheObjectTypes<T>();
-            }
-        }
-
-        /// <summary>
-        /// Clears all static cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        internal void ClearStaticCacheByKeySearch(string keyStartsWith)
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheByKeySearch(keyStartsWith);
-            }
-            else
-            {
-                _staticCache.ClearCacheByKeySearch(keyStartsWith);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        internal void ClearStaticCacheByKeyExpression(string regexString)
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheByKeyExpression(regexString);
-            }
-            else
-            {
-                _staticCache.ClearCacheByKeyExpression(regexString);
-            }
-        }
-
-        internal IEnumerable<T> GetStaticCacheItemsByKeySearch<T>(string keyStartsWith)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
-            else
-            {
-                return _staticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
-        }
-
-        /// <summary>
-        /// Returns a static cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        internal TT GetStaticCacheItem<TT>(string cacheKey)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItem<TT>(cacheKey);
-            }
-            else
-            {
-                return _staticCache.GetCacheItem<TT>(cacheKey);
-            }
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the static cache with all of the default parameters
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        internal TT GetStaticCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
-            else
-            {
-                return _staticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
-        }
-
-        #endregion
-
-
-	    #region Runtime/Http Cache
        /// <summary>
        /// Clears the item in umbraco's runtime cache
        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearAllCache()
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearAllCache();
            }
@@ -214,9 +149,10 @@ namespace Umbraco.Core
        /// Clears the item in umbraco's runtime cache with the given key 
        /// </summary>
        /// <param name="key">Key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheItem(string key)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearCacheItem(key);
            }
@@ -232,9 +168,10 @@ namespace Umbraco.Core
        /// input parameter. (using [object].GetType())
        /// </summary>
        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheObjectTypes(string typeName)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearCacheObjectTypes(typeName);
            }
@@ -247,9 +184,10 @@ namespace Umbraco.Core
        /// <summary>
        /// Clears all objects in the System.Web.Cache with the System.Type specified
        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheObjectTypes<T>()
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearCacheObjectTypes<T>();
            }
@@ -263,9 +201,10 @@ namespace Umbraco.Core
        /// Clears all cache items that starts with the key passed.
        /// </summary>
        /// <param name="keyStartsWith">The start of the key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheByKeySearch(string keyStartsWith)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearCacheByKeySearch(keyStartsWith);
            }
@@ -279,9 +218,10 @@ namespace Umbraco.Core
        /// Clears all cache items that have a key that matches the regular expression
        /// </summary>
        /// <param name="regexString"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheByKeyExpression(string regexString)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                _nullHttpCache.ClearCacheByKeyExpression(regexString);
            }
@@ -291,9 +231,10 @@ namespace Umbraco.Core
            }
        }

+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                return _nullHttpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
            }
@@ -309,9 +250,10 @@ namespace Umbraco.Core
        /// <typeparam name="TT"></typeparam>
        /// <param name="cacheKey"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                return _nullHttpCache.GetCacheItem<TT>(cacheKey);
            }
@@ -328,9 +270,10 @@ namespace Umbraco.Core
        /// <param name="cacheKey"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
            }
@@ -348,16 +291,17 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            TimeSpan timeout, Func<TT> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
            }
        }

@@ -370,17 +314,18 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
            }
        }

@@ -394,17 +339,18 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
            }
        }

@@ -419,6 +365,7 @@ namespace Umbraco.Core
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority,
            CacheItemRemovedCallback refreshAction,
@@ -426,13 +373,19 @@ namespace Umbraco.Core
            TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
            }
        }

@@ -445,6 +398,7 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority,
            CacheDependency cacheDependency,
@@ -452,11 +406,17 @@ namespace Umbraco.Core
        {
            if (!_enableCache)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, null, false, priority, null, null);
            }
            else
            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
+                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
            }
        }

@@ -471,13 +431,13 @@ namespace Umbraco.Core
                                       CacheItemPriority priority,
                                       Func<T> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
            }
        }

@@ -494,13 +454,13 @@ namespace Umbraco.Core
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
            }
        }

@@ -513,19 +473,25 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       CacheDependency cacheDependency,
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority, dependentFiles:null);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
            }
        }

@@ -539,6 +505,7 @@ namespace Umbraco.Core
        /// <param name="cacheDependency"></param>
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       CacheItemRemovedCallback refreshAction,
@@ -546,13 +513,18 @@ namespace Umbraco.Core
                                       TimeSpan? timeout,
                                       Func<T> getCacheItem)
        {
-            if (!_enableCache)
+            if (_enableCache == false)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
            }
            else
            {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
            }
        } 
        #endregion
@@ -1,24 +1,15 @@
-using System.Configuration;
-using Umbraco.Core.Configuration;
+using System.Collections.Generic;
+using System.Configuration;

-namespace Umbraco.Web.BaseRest.Configuration
+namespace Umbraco.Core.Configuration.BaseRest
 {
-    // note: the name should be "BaseRest" but we keep it "BaseRestSection" for compat. reasons.

-    [ConfigurationKey("BaseRestExtensions")]
-    internal class BaseRestSection : UmbracoConfigurationSection
+    internal class BaseRestSection : UmbracoConfigurationSection, IBaseRestSection
    {
        private const string KeyEnabled = "enabled";

        private bool? _enabled;
-
-        internal protected override void ResetSection()
-        {
-            base.ResetSection();
-
-            _enabled = null;
-        }
-
+        
        [ConfigurationProperty("", IsKey = false, IsRequired = false, IsDefaultCollection = true)]
 		public ExtensionElementCollection Items
 		{
@@ -33,11 +24,15 @@ namespace Umbraco.Web.BaseRest.Configuration
        {
            get
            {
-                return _enabled ?? (IsPresent
-                    ? (bool)this[KeyEnabled]
-                    : true);
+                return _enabled ?? (IsPresent == false || (bool)this[KeyEnabled]);
            }
            internal set { _enabled = value; }
        }
+
+        IExtensionsCollection IBaseRestSection.Items
+        {
+            get { return Items; }
+        }
+
    }
 }
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Configuration;

-namespace Umbraco.Web.BaseRest.Configuration
+namespace Umbraco.Core.Configuration.BaseRest
 {
-	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-	public class ExtensionElement : ConfigurationElementCollection
-	{
+
+    [ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
+    internal class ExtensionElement : ConfigurationElementCollection, IEnumerable<IMethodSection>, IExtension
+    {
 		const string KeyAlias = "alias";
 		const string KeyType = "type";
 		const string KeyMethod = "method";
@@ -59,5 +58,24 @@ namespace Umbraco.Web.BaseRest.Configuration
 		{
 			get { return (MethodElement)BaseGet(index); }
 		}
-	}
+
+        IEnumerator<IMethodSection> IEnumerable<IMethodSection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IMethodSection;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IMethodSection IExtension.this[string index]
+        {
+            get { return this[index]; }
+        }
+
+    }
 }
@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Configuration;

-namespace Umbraco.Web.BaseRest.Configuration
+namespace Umbraco.Core.Configuration.BaseRest
 {
+    public interface IExtensionsCollection : IEnumerable<IExtension>
+    {
+        IExtension this[string index] { get; }
+    }
+
 	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-	public class ExtensionElementCollection : ConfigurationElementCollection
+    internal class ExtensionElementCollection : ConfigurationElementCollection, IExtensionsCollection
 	{
 		const string KeyExtension = "extension";

@@ -45,5 +48,23 @@ namespace Umbraco.Web.BaseRest.Configuration
 		{
 			get { return (ExtensionElement)BaseGet(index); }
 		}
-	}
+
+        IEnumerator<IExtension> IEnumerable<IExtension>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IExtension;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IExtension IExtensionsCollection.this[string index]
+        {
+            get { return this[index]; }
+        }
+    }
 }
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IBaseRestSection
+    {
+        IExtensionsCollection Items { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether base rest extensions are enabled.
+        /// </summary>
+        bool Enabled { get; }
+    }
+}
@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IExtension
+    {
+        string Alias { get; }
+
+        string Type { get; }
+
+        IMethodSection this[string index] { get; }
+    }
+}
@@ -0,0 +1,17 @@
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IMethodSection
+    {
+        string Name { get; }
+
+        bool AllowAll { get; }
+
+        string AllowGroup { get; }
+
+        string AllowType { get; }
+
+        string AllowMember { get; }
+
+        bool ReturnXml { get; }
+    }
+}
@@ -1,9 +1,9 @@
 using System.Configuration;

-namespace Umbraco.Web.BaseRest.Configuration
+namespace Umbraco.Core.Configuration.BaseRest
 {
-	public class MethodElement : ConfigurationElement
-	{
+    internal class MethodElement : ConfigurationElement, IMethodSection
+    {
 		const string KeyName = "name";
 		const string KeyAllowAll = "allowAll";
 		const string KeyAllowGroup = "allowGroup";
@@ -0,0 +1,70 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Defines a configuration section that contains inner text that is comma delimited
+    /// </summary>
+    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
+    {
+        public override CommaDelimitedStringCollection Value
+        {
+            get 
+            { 
+                var converter = new CommaDelimitedStringCollectionConverter();
+                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
+            }
+        }
+
+        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        /// <summary>
+        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
+        /// </summary>
+        private class InnerEnumerator : IEnumerator<string>
+        {
+            private readonly StringEnumerator _stringEnumerator;
+
+            public InnerEnumerator(StringEnumerator stringEnumerator)
+            {
+                _stringEnumerator = stringEnumerator;
+            }
+
+            public bool MoveNext()
+            {
+                return _stringEnumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                _stringEnumerator.Reset();
+            }
+
+            string IEnumerator<string>.Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public object Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public void Dispose()
+            {
+                ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
+            }
+        }
+    }
+}
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-	/// <summary>
-	/// Indicates the configuration key for a section or a group.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-	public sealed class ConfigurationKeyAttribute : Attribute
-	{
-	    /// <summary>
-	    /// Initializes a new instance of the <see cref="ConfigurationKeyAttribute"/> class with a configuration key.
-	    /// </summary>
-	    /// <param name="configurationKey">The configurationkey.</param>
-	    public ConfigurationKeyAttribute(string configurationKey)
-	    {
-	        ConfigurationKey = configurationKey;
-	    }
-
-        /// <summary>
-        /// Gets or sets the configuration key.
-        /// </summary>
-        public string ConfigurationKey { get; private set; }
-	}
-}
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessElement : RawXmlConfigurationElement, IAccess
+    {
+        public AccessElement()
+        {
+            
+        }
+
+        public AccessElement(XElement rawXml)
+            :base(rawXml)
+        {
+        }
+
+        public IEnumerable<IAccessItem> Rules
+        {
+            get
+            {
+                var result = new List<AccessItem>();
+                if (RawXml != null)
+                {
+                    result.AddRange(RawXml.Elements("deny").Select(x => new AccessItem {Action = AccessType.Deny, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grant").Select(x => new AccessItem { Action = AccessType.Grant, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grantBySection").Select(x => new AccessItem { Action = AccessType.GrantBySection, Value = x.Value }));
+                }
+                return result;
+            }
+        }
+    }
+}
@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessItem : IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        public AccessType Action { get; set; }
+        
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        public string Value { get; set; }
+    }
+}
@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public enum AccessType
+    {
+        Grant,
+        Deny,
+        GrantBySection
+    }
+}
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaCollection : ConfigurationElementCollection, IEnumerable<IArea>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new AreaElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((AreaElement) element).Value;
+        }
+
+        IEnumerator<IArea> IEnumerable<IArea>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IArea;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaElement : InnerTextConfigurationElement<string>, IArea
+    {
+        string IArea.AreaName
+        {
+            get { return Value; }
+        }
+    }
+}
@@ -0,0 +1,15 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreasElement : ConfigurationElement
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "area")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public AreaCollection AreaCollection
+        {
+            get { return (AreaCollection)base[""]; }
+            set { base[""] = value; }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class ControlCollection : ConfigurationElementCollection, IEnumerable<IDashboardControl>
+    {
+        internal void Add(ControlElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ControlElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ControlElement)element).ControlPath;
+        }
+
+        IEnumerator<IDashboardControl> IEnumerable<IDashboardControl>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardControl;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,74 @@
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    
+    internal class ControlElement : RawXmlConfigurationElement, IDashboardControl
+    {
+        public bool ShowOnce
+        {
+            get
+            {
+                return RawXml.Attribute("showOnce") == null
+                           ? false
+                           : bool.Parse(RawXml.Attribute("showOnce").Value);
+            }
+        }
+
+        public bool AddPanel
+        {
+            get
+            {
+                return RawXml.Attribute("addPanel") == null
+                           ? true
+                           : bool.Parse(RawXml.Attribute("addPanel").Value);
+            }
+        }
+
+        public string PanelCaption
+        {
+            get
+            {
+                return RawXml.Attribute("panelCaption") == null
+                           ? ""
+                           : RawXml.Attribute("panelCaption").Value;
+            }
+        }
+
+        public AccessElement Access
+        {
+            get
+            {
+                var access = RawXml.Element("access");
+                if (access == null)
+                {
+                    return new AccessElement();
+                }
+                return new AccessElement(access);
+            }
+        }
+
+        public string ControlPath 
+        { 
+            get
+            {
+                //we need to return the first (and only) text element of the children (wtf... who designed this configuration ! :P )
+                var txt = RawXml.Nodes().OfType<XText>().FirstOrDefault();
+                if (txt == null)
+                {
+                    throw new ConfigurationErrorsException("The control element must contain a text node indicating the control path");
+                }
+                return txt.Value.Trim();
+            }
+        }
+
+
+        IAccess IDashboardControl.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class DashboardSection : ConfigurationSection, IDashboardSection
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "section")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public SectionCollection SectionCollection
+        {
+            get { return (SectionCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<ISection> IDashboardSection.Sections
+        {
+            get { return SectionCollection; }
+        }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccess
+    {
+        IEnumerable<IAccessItem> Rules { get; }
+    }
+}
@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        AccessType Action { get; set; }
+
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        string Value { get; set; }
+    }
+}
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IArea
+    {
+        string AreaName { get; }
+    }
+}
@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardControl
+    {
+        bool ShowOnce { get; }
+
+        bool AddPanel { get; }
+
+        string PanelCaption { get; }
+
+        string ControlPath { get; }
+
+        IAccess AccessRights { get; }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardSection
+    {
+        IEnumerable<ISection> Sections { get; }
+    }
+}
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardTab
+    {
+        string Caption { get; }
+
+        IEnumerable<IDashboardControl> Controls { get; }
+
+        IAccess AccessRights { get; }
+    }
+}
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface ISection
+    {
+        string Alias { get; }
+
+        IEnumerable<string> Areas { get; }
+
+        IEnumerable<IDashboardTab> Tabs { get; }
+
+        IAccess AccessRights { get; }
+    }
+}
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionCollection : ConfigurationElementCollection, IEnumerable<ISection>
+    {
+        internal void Add(SectionElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new SectionElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((SectionElement)element).Alias;
+        }
+
+        IEnumerator<ISection> IEnumerable<ISection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as ISection;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionElement : ConfigurationElement, ISection
+    {
+        [ConfigurationProperty("alias", IsRequired = true)]
+        public string Alias
+        {
+            get { return (string) this["alias"]; }
+        }
+
+        [ConfigurationProperty("areas", IsRequired = true)]
+        public AreasElement Areas
+        {
+            get { return (AreasElement)this["areas"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "tab")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public TabCollection TabCollection
+        {
+            get { return (TabCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<IDashboardTab> ISection.Tabs
+        {
+            get { return TabCollection; }            
+        }
+
+        IEnumerable<string> ISection.Areas
+        {
+            get { return Areas.AreaCollection.Cast<AreaElement>().Select(x => x.Value); }
+        }
+
+        IAccess ISection.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabCollection : ConfigurationElementCollection, IEnumerable<IDashboardTab>
+    {
+        internal void Add(TabElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new TabElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((TabElement)element).Caption;
+        }
+
+        IEnumerator<IDashboardTab> IEnumerable<IDashboardTab>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardTab;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabElement : ConfigurationElement, IDashboardTab
+    {
+        [ConfigurationProperty("caption", IsRequired = true)]
+        public string Caption
+        {
+            get { return (string)this["caption"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(ControlCollection), AddItemName = "control")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public ControlCollection ControlCollection
+        {
+            get { return (ControlCollection)base[""]; }
+            set { base[""] = value; }
+        }
+        
+        IEnumerable<IDashboardControl> IDashboardTab.Controls
+        {
+            get { return ControlCollection; }            
+        }
+
+        IAccess IDashboardTab.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}
@@ -8,7 +8,6 @@ namespace Umbraco.Core.Configuration
 {
    public class FileSystemProvidersSection : ConfigurationSection
    {
-        private const string PROVIDERS_KEY = "providers";

        [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)]
        public FileSystemProviderElementCollection Providers
@@ -4,6 +4,7 @@ using System.Configuration;
 using System.Linq;
 using System.Web;
 using System.Web.Configuration;
+using System.Web.Hosting;
 using System.Web.Routing;
 using System.Xml;
 using System.Xml.Linq;
@@ -115,13 +116,16 @@ namespace Umbraco.Core.Configuration
        /// Gets the name of the content XML file.
        /// </summary>
        /// <value>The content XML.</value>
+        /// <remarks>
+        /// Defaults to ~/App_Data/umbraco.config
+        /// </remarks>
        public static string ContentXmlFile
        {
            get
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
                    ? ConfigurationManager.AppSettings["umbracoContentXML"]
-                    : string.Empty;
+                    : "~/App_Data/umbraco.config";
            }
        }

@@ -135,7 +139,7 @@ namespace Umbraco.Core.Configuration
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoStorageDirectory")
                    ? ConfigurationManager.AppSettings["umbracoStorageDirectory"]
-                    : string.Empty;
+                    : "~/App_Data";
            }
        }

@@ -175,7 +179,10 @@ namespace Umbraco.Core.Configuration
                {
                    throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
                }
-			    return Path.TrimStart(SystemDirectories.Root).TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+                var path = Path;
+                if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
+                    path = path.Substring(SystemDirectories.Root.Length);
+			    return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
            }
        }

@@ -197,7 +204,7 @@ namespace Umbraco.Core.Configuration
        /// Gets the database connection string
        /// </summary>
        /// <value>The database connection string.</value>
-        [Obsolete("Use System.ConfigurationManager.ConnectionStrings to get the connection with the key Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName instead")]
+        [Obsolete("Use System.Configuration.ConfigurationManager.ConnectionStrings[\"umbracoDbDSN\"] instead")]
        public static string DbDsn
        {
            get
@@ -209,7 +216,7 @@ namespace Umbraco.Core.Configuration
                {
                    connectionString = settings.ConnectionString;

-                    // The SqlCe connectionString is formatted slightly differently, so we need to updat it
+                    // The SqlCe connectionString is formatted slightly differently, so we need to update it
                    if (settings.ProviderName.Contains("SqlServerCe"))
                        connectionString = string.Format("datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;{0}", connectionString);
                }
@@ -261,10 +268,10 @@ namespace Umbraco.Core.Configuration
        /// <param name="value">Value of the setting to be saved.</param>
        internal static void SaveSetting(string key, string value)
        {
-            var fileName = GetFullWebConfigFileName();
+            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);

-            var appSettings = xml.Root.Descendants("appSettings").Single();
+            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();

            // Update appSetting if it exists, or else create a new appSetting for the given key and value
            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
@@ -283,10 +290,10 @@ namespace Umbraco.Core.Configuration
        /// <param name="key">Key of the setting to be removed.</param>
        internal static void RemoveSetting(string key)
        {
-            var fileName = GetFullWebConfigFileName();
+            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);

-            var appSettings = xml.Root.Descendants("appSettings").Single();
+            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);

            if (setting != null)
@@ -297,21 +304,6 @@ namespace Umbraco.Core.Configuration
            }
        }

-        private static string GetFullWebConfigFileName()
-        {
-            var webConfig = new WebConfigurationFileMap();
-            var vDir = FullpathToRoot;
-
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                    vDir = v.PhysicalDirectory;
-            }
-
-            var fileName = System.IO.Path.Combine(vDir, "web.config");
-            return fileName;
-        }
-
        /// <summary>
        /// Gets the full path to root.
        /// </summary>
@@ -331,7 +323,13 @@ namespace Umbraco.Core.Configuration
            {
                try
                {
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoDebugMode"]);
+                    if (HttpContext.Current != null)
+                    {
+                        return HttpContext.Current.IsDebuggingEnabled;
+                    }
+                    //go and get it from config directly
+                    var section = ConfigurationManager.GetSection("system.web/compilation") as CompilationSection;
+                    return section != null && section.Debug;
                }
                catch
                {
@@ -430,13 +428,24 @@ namespace Umbraco.Core.Configuration
        /// Returns a string value to determine if umbraco should disbable xslt extensions
        /// </summary>
        /// <value><c>"true"</c> if version xslt extensions are disabled, otherwise, <c>"false"</c></value>
+        [Obsolete("This is no longer used and will be removed from the codebase in future releases")]
        public static string DisableXsltExtensions
        {
            get
            {
                return ConfigurationManager.AppSettings.ContainsKey("umbracoDisableXsltExtensions")
                    ? ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"]
-                    : string.Empty;
+                    : "false";
+            }
+        }
+
+        internal static bool ContentCacheXmlStoredInCodeGen
+        {
+            get
+            {
+                //defaults to false
+                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp") 
+                    && bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]); //default to false
            }
        }

@@ -444,14 +453,10 @@ namespace Umbraco.Core.Configuration
        /// Returns a string value to determine if umbraco should use Xhtml editing mode in the wysiwyg editor
        /// </summary>
        /// <value><c>"true"</c> if Xhtml mode is enable, otherwise, <c>"false"</c></value>
+        [Obsolete("This is no longer used and will be removed from the codebase in future releases")]
        public static string EditXhtmlMode
        {
-            get
-            {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoEditXhtmlMode")
-                    ? ConfigurationManager.AppSettings["umbracoEditXhtmlMode"]
-                    : string.Empty;
-            }
+            get { return "true"; }
        }

        /// <summary>
@@ -476,9 +481,10 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
+                //the default will be 'profiler'
                return ConfigurationManager.AppSettings.ContainsKey("umbracoProfileUrl")
                    ? ConfigurationManager.AppSettings["umbracoProfileUrl"]
-                    : string.Empty;
+                    : "profiler";
            }
        }

@@ -579,21 +585,11 @@ namespace Umbraco.Core.Configuration
            return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1;
        }

-        public static bool RequestIsLiveEditRedirector(HttpContext context)
-        {
-            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
-        }
-
        public static bool RequestIsInUmbracoApplication(HttpContextBase context)
        {
            return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1;
        }

-        public static bool RequestIsLiveEditRedirector(HttpContextBase context)
-        {
-            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
-        }
-
        /// <summary>
        /// Gets a value indicating whether umbraco should force a secure (https) connection to the backoffice.
        /// </summary>
@@ -0,0 +1,69 @@
+using System;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A full config section is required for any full element and we have some elements that are defined like this:
+    /// {element}MyValue{/element} instead of as attribute values.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
+    {
+        public InnerTextConfigurationElement()
+        {
+        }
+
+        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
+        {
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            base.DeserializeElement(reader, serializeCollectionKey);
+            //now validate and set the raw value
+            if (RawXml.HasElements)
+                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
+            RawValue = RawXml.Value.Trim();
+
+            //RawValue = reader.ReadElementContentAsString();
+        }
+
+        public virtual T Value
+        {
+            get
+            {
+                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
+                if (converted.Success == false)
+                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
+                return converted.Result;
+            }
+        }
+
+        /// <summary>
+        /// Exposes the raw string value
+        /// </summary>
+        internal string RawValue { get; set; }
+
+        /// <summary>
+        /// Implicit operator so we don't need to use the 'Value' property explicitly
+        /// </summary>
+        /// <param name="m"></param>
+        /// <returns></returns>
+        public static implicit operator T(InnerTextConfigurationElement<T> m)
+        {
+            return m.Value;
+        }
+
+        /// <summary>
+        /// Return the string value of Value
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return string.Format("{0}", Value);
+        }
+
+    }
+}
@@ -0,0 +1,43 @@
+using System.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Used for specifying default values for comma delimited config
+    /// </summary>
+    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
+    {
+        private readonly CommaDelimitedConfigurationElement _wrapped;
+        private readonly string[] _defaultValue;
+
+        public OptionalCommaDelimitedConfigurationElement()
+        {            
+        }
+
+        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override CommaDelimitedStringCollection Value
+        {
+            get
+            {
+                if (_wrapped == null)
+                {
+                    return base.Value;
+                }
+
+                if (string.IsNullOrEmpty(_wrapped.RawValue))
+                {
+                    var val = new CommaDelimitedStringCollection();
+                    val.AddRange(_defaultValue);
+                    return val;
+                }
+                return _wrapped.Value;
+            }
+        }
+    }
+}
@@ -0,0 +1,23 @@
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// This is used to supply optional/default values when using InnerTextConfigurationElement
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
+    {
+        private readonly InnerTextConfigurationElement<T> _wrapped;
+        private readonly T _defaultValue;
+
+        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override T Value
+        {
+            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
+        }
+    }
+}
@@ -0,0 +1,30 @@
+using System.Configuration;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
+    /// to do with as they please.
+    /// </summary>
+    internal abstract class RawXmlConfigurationElement : ConfigurationElement
+    {
+        protected RawXmlConfigurationElement()
+        {
+            
+        }
+
+        protected RawXmlConfigurationElement(XElement rawXml)
+        {
+            RawXml = rawXml;
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            RawXml = (XElement)XNode.ReadFrom(reader);
+        }
+
+        protected XElement RawXml { get; private set; }
+    }
+}
@@ -10,6 +10,7 @@ namespace Umbraco.Core.Configuration

    internal class RazorDataTypeModelStaticMappingItem
    {
+        [Obsolete("This is not used whatsoever")]
 		public string Raw { get; set; }
        //if all of the set (non null) properties match the property data currently being evaluated
 		public string PropertyTypeAlias { get; set; }
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Configuration.BaseRest;
+using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// The gateway to all umbraco configuration
+    /// </summary>
+    public class UmbracoConfig
+    {
+        #region Singleton
+
+        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
+
+        public static UmbracoConfig For
+        {
+            get { return Lazy.Value; }            
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Default constructor 
+        /// </summary>
+        private UmbracoConfig()
+        {
+            if (_umbracoSettings == null)
+            {
+                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;
+                if (umbracoSettings == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IUmbracoSettingsSection) + " from config file!");
+                }
+                SetUmbracoSettings(umbracoSettings);
+            }
+
+            if (_baseRestExtensions == null)
+            {
+                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;
+                if (baseRestExtensions == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IBaseRestSection) + " from config file!");
+                }
+                SetBaseRestExtensions(baseRestExtensions);
+            }
+
+            if (_dashboardSection == null)
+            {
+                var dashboardConfig = ConfigurationManager.GetSection("umbracoConfiguration/dashBoard") as IDashboardSection;
+                if (dashboardConfig == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IDashboardSection) + " from config file!");
+                }
+                SetDashboardSettings(dashboardConfig);
+            }
+        }
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoSettings"></param>
+        /// <param name="baseRestSettings"></param>
+        /// <param name="dashboardSettings"></param>
+        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings)
+        {
+            SetUmbracoSettings(umbracoSettings);
+            SetBaseRestExtensions(baseRestSettings);
+            SetDashboardSettings(dashboardSettings);
+        }
+
+        private IDashboardSection _dashboardSection;
+        private IUmbracoSettingsSection _umbracoSettings;
+        private IBaseRestSection _baseRestExtensions;
+
+        /// <summary>
+        /// Gets the IDashboardSection
+        /// </summary>
+        public IDashboardSection DashboardSettings()
+        {
+            return _dashboardSection;
+        }        
+
+        //ONLY for unit testing
+        internal void SetDashboardSettings(IDashboardSection value)
+        {
+            _dashboardSection = value;
+        }
+
+        //ONLY for unit testing
+        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
+        {
+            _umbracoSettings = value;
+        }
+
+        /// <summary>
+        /// Gets the IUmbracoSettings
+        /// </summary>
+        public IUmbracoSettingsSection UmbracoSettings()
+        {
+            return _umbracoSettings;
+        }
+        
+        //ONLY for unit testing
+        public void SetBaseRestExtensions(IBaseRestSection value)
+        {
+            _baseRestExtensions = value;
+        }
+
+        /// <summary>
+        /// Gets the IBaseRestSection
+        /// </summary>
+        public IBaseRestSection BaseRestExtensions()
+        {
+            return _baseRestExtensions;
+        }
+
+        //TODO: Add other configurations here !
+    }
+}
@@ -2,8 +2,13 @@

 namespace Umbraco.Core.Configuration
 {
-    // note - still must work on how to support read-only and ResetSection for collections
-    // note - still must work on how to spread config over files (aka DeepConfig in v5)
+    /// <summary>
+    /// Represents an Umbraco configuration section which can be used to pass to UmbracoConfiguration.For{T}
+    /// </summary>
+    public interface IUmbracoConfigurationSection
+    {
+        
+    }

    /// <summary>
    /// Represents an Umbraco section within the configuration file.
@@ -16,18 +21,12 @@ namespace Umbraco.Core.Configuration
    /// <para>The <c>UmbracoSettings.For{T}</c> method will return a section, either one that
    /// is in the configuration file, or a section that was created with default values.</para>
    /// </remarks>
-    public abstract class UmbracoConfigurationSection : ConfigurationSection
+    public abstract class UmbracoConfigurationSection : ConfigurationSection, IUmbracoConfigurationSection
    {
        /// <summary>
        /// Gets a value indicating whether the section actually is in the configuration file.
        /// </summary>
        protected bool IsPresent { get { return ElementInformation.IsPresent; } }

-        /// <summary>
-        /// Resets settings that were set programmatically, to their initial values.
-        /// </summary>
-        /// <remarks>>To be used in unit tests.</remarks>
-        internal protected virtual void ResetSection()
-        { }
    }
 }
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class AppCodeFileExtensionsCollection : ConfigurationElementCollection, IEnumerable<IFileExtension>
+    {
+        internal void Add(FileExtensionElement element)
+        {
+            base.BaseAdd(element);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new FileExtensionElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((FileExtensionElement)element).Value;
+        }
+
+        IEnumerator<IFileExtension> IEnumerable<IFileExtension>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IFileExtension;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class AppCodeFileExtensionsElement : ConfigurationElement
+    {
+        [ConfigurationCollection(typeof(AppCodeFileExtensionsCollection), AddItemName = "ext")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        internal AppCodeFileExtensionsCollection AppCodeFileExtensionsCollection
+        {
+            get { return (AppCodeFileExtensionsCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+    }
+}
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class CharCollection : ConfigurationElementCollection, IEnumerable<IChar>
+    {
+        internal void Add(CharElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new CharElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((CharElement)element).Char;
+        }
+
+        IEnumerator<IChar> IEnumerable<IChar>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IChar;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,32 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class CharElement : InnerTextConfigurationElement<string>, IChar
+    {
+        private string _char;
+        private string _replacement;
+
+        internal string Char
+        {
+            get { return _char ?? (_char = (string)RawXml.Attribute("org")); }
+            set { _char = value; }
+        }
+
+        internal string Replacement
+        {
+            get { return _replacement ?? (_replacement = Value); }
+            set { _replacement = value; }
+        }
+
+        string IChar.Char
+        {
+            get { return Char; }
+            
+        }
+
+        string IChar.Replacement
+        {
+            get { return Replacement; }
+            
+        }
+    }
+}
@@ -0,0 +1,418 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+
+    internal class ContentElement : ConfigurationElement, IContentSection
+    {
+        [ConfigurationProperty("imaging")]
+        internal ContentImagingElement Imaging
+        {
+            get { return (ContentImagingElement)this["imaging"]; }
+        }
+
+        [ConfigurationProperty("scripteditor")]
+        internal ContentScriptEditorElement ScriptEditor
+        {
+            get { return (ContentScriptEditorElement)this["scripteditor"]; }
+        }
+
+        [ConfigurationProperty("ResolveUrlsFromTextString")]
+        internal InnerTextConfigurationElement<bool> ResolveUrlsFromTextString
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                       (InnerTextConfigurationElement<bool>)this["ResolveUrlsFromTextString"],
+                        //set the default
+                       true);
+            }
+        }
+
+        [ConfigurationProperty("UploadAllowDirectories")]
+        internal InnerTextConfigurationElement<bool> UploadAllowDirectories
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                       (InnerTextConfigurationElement<bool>)this["UploadAllowDirectories"],
+                    //set the default
+                       true);
+            }
+        }
+
+        public IEnumerable<IContentErrorPage> Error404Collection
+        {
+            get { return Errors.Error404Collection; }
+        }
+
+        [ConfigurationProperty("errors", IsRequired = true)]
+        internal ContentErrorsElement Errors
+        {
+            get { return (ContentErrorsElement) base["errors"]; }
+        }
+
+        [ConfigurationProperty("notifications", IsRequired = true)]
+        internal NotificationsElement Notifications
+        {
+            get { return (NotificationsElement)base["notifications"]; }
+        }
+
+        [ConfigurationProperty("ensureUniqueNaming")]
+        internal InnerTextConfigurationElement<bool> EnsureUniqueNaming
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                      (InnerTextConfigurationElement<bool>)this["ensureUniqueNaming"],
+                    //set the default
+                      true);
+            }
+        }
+
+        [ConfigurationProperty("TidyEditorContent")]
+        internal InnerTextConfigurationElement<bool> TidyEditorContent
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                      (InnerTextConfigurationElement<bool>)this["TidyEditorContent"],
+                    //set the default
+                      false);
+            }
+        }
+
+        [ConfigurationProperty("TidyCharEncoding")]
+        internal InnerTextConfigurationElement<string> TidyCharEncoding
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["TidyCharEncoding"],
+                            //set the default
+                          "UTF8");
+            }
+        }
+
+        [ConfigurationProperty("XmlCacheEnabled")]
+        internal InnerTextConfigurationElement<bool> XmlCacheEnabled
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["XmlCacheEnabled"],
+                    //set the default
+                          true);
+            }
+        }
+
+        [ConfigurationProperty("ContinouslyUpdateXmlDiskCache")]
+        internal InnerTextConfigurationElement<bool> ContinouslyUpdateXmlDiskCache
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["ContinouslyUpdateXmlDiskCache"],
+                    //set the default
+                          true);                
+            }
+        }
+
+        [ConfigurationProperty("XmlContentCheckForDiskChanges")]
+        internal InnerTextConfigurationElement<bool> XmlContentCheckForDiskChanges
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["XmlContentCheckForDiskChanges"],
+                    //set the default
+                          false); 
+            }
+        }
+
+        [ConfigurationProperty("EnableSplashWhileLoading")]
+        internal InnerTextConfigurationElement<bool> EnableSplashWhileLoading
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["EnableSplashWhileLoading"],
+                    //set the default
+                          false); 
+            }
+        }
+
+        [ConfigurationProperty("PropertyContextHelpOption")]
+        internal InnerTextConfigurationElement<string> PropertyContextHelpOption
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["PropertyContextHelpOption"],
+                    //set the default
+                          "text"); 
+            }
+        }
+
+        [ConfigurationProperty("UseLegacyXmlSchema")]
+        internal InnerTextConfigurationElement<bool> UseLegacyXmlSchema
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["UseLegacyXmlSchema"],
+                    //set the default
+                          false); 
+            }
+        }
+        
+        [ConfigurationProperty("ForceSafeAliases")]
+        internal InnerTextConfigurationElement<bool> ForceSafeAliases
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["ForceSafeAliases"],
+                    //set the default
+                          true); 
+            }
+        }
+
+        [ConfigurationProperty("PreviewBadge")]
+        internal InnerTextConfigurationElement<string> PreviewBadge
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["PreviewBadge"],
+                    //set the default
+                          @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>"); 
+            }
+        }
+
+        [ConfigurationProperty("UmbracoLibraryCacheDuration")]
+        internal InnerTextConfigurationElement<int> UmbracoLibraryCacheDuration
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<int>(
+                          (InnerTextConfigurationElement<int>)this["UmbracoLibraryCacheDuration"],
+                    //set the default
+                          1800); 
+                
+            }
+        }
+
+        [ConfigurationProperty("MacroErrors")]
+        internal InnerTextConfigurationElement<MacroErrorBehaviour> MacroErrors
+        {
+            get
+            {
+
+                return new OptionalInnerTextConfigurationElement<MacroErrorBehaviour>(
+                          (InnerTextConfigurationElement<MacroErrorBehaviour>)this["MacroErrors"],
+                    //set the default
+                          MacroErrorBehaviour.Inline); 
+            }
+        }
+
+        [Obsolete("This is here so that if this config element exists we won't get a YSOD, it is not used whatsoever and will be removed in future versions")]
+        [ConfigurationProperty("DocumentTypeIconList")]
+        internal InnerTextConfigurationElement<IconPickerBehaviour> DocumentTypeIconList
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<IconPickerBehaviour>(
+                          (InnerTextConfigurationElement<IconPickerBehaviour>)this["DocumentTypeIconList"],
+                    //set the default
+                          IconPickerBehaviour.HideFileDuplicates);
+            }
+        }
+
+        [ConfigurationProperty("disallowedUploadFiles")]
+        internal CommaDelimitedConfigurationElement DisallowedUploadFiles
+        {
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (CommaDelimitedConfigurationElement)this["disallowedUploadFiles"],
+                    //set the default
+                       new[] { "ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd" });
+
+            }
+        }
+
+        [ConfigurationProperty("cloneXmlContent")]
+        internal InnerTextConfigurationElement<bool> CloneXmlContent
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["cloneXmlContent"],
+                    //set the default
+                    true);
+            }
+        }
+
+        [ConfigurationProperty("GlobalPreviewStorageEnabled")]
+        internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["GlobalPreviewStorageEnabled"],
+                    //set the default
+                    false);
+            }
+        }
+
+        [ConfigurationProperty("defaultDocumentTypeProperty")]
+        internal InnerTextConfigurationElement<string> DefaultDocumentTypeProperty
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                    (InnerTextConfigurationElement<string>)this["defaultDocumentTypeProperty"],
+                    //set the default
+                    "Textstring");
+            }
+        }
+
+        string IContentSection.NotificationEmailAddress
+        {
+            get { return Notifications.NotificationEmailAddress; }
+        }
+
+        bool IContentSection.DisableHtmlEmail
+        {
+            get { return Notifications.DisableHtmlEmail; }
+        }
+
+        IEnumerable<string> IContentSection.ImageFileTypes
+        {
+            get { return Imaging.ImageFileTypes; }
+        }
+
+        IEnumerable<string> IContentSection.ImageTagAllowedAttributes
+        {
+            get { return Imaging.ImageTagAllowedAttributes; }
+        }
+
+        IEnumerable<IImagingAutoFillUploadField> IContentSection.ImageAutoFillProperties
+        {
+            get { return Imaging.ImageAutoFillProperties; }
+        }
+
+        bool IContentSection.ScriptEditorDisable
+        {
+            get { return ScriptEditor.ScriptEditorDisable; }
+        }
+
+        string IContentSection.ScriptFolderPath
+        {
+            get { return ScriptEditor.ScriptFolderPath; }
+        }
+
+        IEnumerable<string> IContentSection.ScriptFileTypes
+        {
+            get { return ScriptEditor.ScriptFileTypes; }
+        }
+
+        bool IContentSection.ResolveUrlsFromTextString
+        {
+            get { return ResolveUrlsFromTextString; }
+        }
+
+        bool IContentSection.UploadAllowDirectories
+        {
+            get { return UploadAllowDirectories; }
+        }        
+
+        bool IContentSection.EnsureUniqueNaming
+        {
+            get { return EnsureUniqueNaming; }
+        }
+
+        bool IContentSection.TidyEditorContent
+        {
+            get { return TidyEditorContent; }
+        }
+
+        string IContentSection.TidyCharEncoding
+        {
+            get { return TidyCharEncoding; }
+        }
+
+        bool IContentSection.XmlCacheEnabled
+        {
+            get { return XmlCacheEnabled; }
+        }
+
+        bool IContentSection.ContinouslyUpdateXmlDiskCache
+        {
+            get { return ContinouslyUpdateXmlDiskCache; }
+        }
+
+        bool IContentSection.XmlContentCheckForDiskChanges
+        {
+            get { return XmlContentCheckForDiskChanges; }
+        }
+
+        bool IContentSection.EnableSplashWhileLoading
+        {
+            get { return EnableSplashWhileLoading; }
+        }
+
+        string IContentSection.PropertyContextHelpOption
+        {
+            get { return PropertyContextHelpOption; }
+        }
+
+        bool IContentSection.UseLegacyXmlSchema
+        {
+            get { return UseLegacyXmlSchema; }
+        }
+
+        bool IContentSection.ForceSafeAliases
+        {
+            get { return ForceSafeAliases; }
+        }
+
+        string IContentSection.PreviewBadge
+        {
+            get { return PreviewBadge; }
+        }
+
+        int IContentSection.UmbracoLibraryCacheDuration
+        {
+            get { return UmbracoLibraryCacheDuration; }
+        }
+
+        MacroErrorBehaviour IContentSection.MacroErrorBehaviour
+        {
+            get { return MacroErrors; }
+        }
+
+        IEnumerable<string> IContentSection.DisallowedUploadFiles
+        {
+            get { return DisallowedUploadFiles; }
+        }
+
+        bool IContentSection.CloneXmlContent
+        {
+            get { return CloneXmlContent; }
+        }
+
+        bool IContentSection.GlobalPreviewStorageEnabled
+        {
+            get { return GlobalPreviewStorageEnabled; }
+        }
+
+        string IContentSection.DefaultDocumentTypeProperty
+        {
+            get { return DefaultDocumentTypeProperty; }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentError404Collection : ConfigurationElementCollection, IEnumerable<ContentErrorPageElement>
+    {
+        internal void Add(ContentErrorPageElement element)
+        {
+            BaseAdd(element);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ContentErrorPageElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ContentErrorPageElement)element).Culture
+                + ((ContentErrorPageElement)element).Value;
+        }
+
+        IEnumerator<ContentErrorPageElement> IEnumerable<ContentErrorPageElement>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as ContentErrorPageElement;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,28 @@
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentErrorPageElement : InnerTextConfigurationElement<int>, IContentErrorPage
+    {
+        public ContentErrorPageElement(XElement rawXml)
+            : base(rawXml)
+        {
+        }
+
+        public ContentErrorPageElement()
+        {
+            
+        }
+
+        public int ContentId
+        {
+            get { return Value; }
+        }
+
+        public string Culture
+        {
+            get { return (string) RawXml.Attribute("culture"); }
+            set { RawXml.Attribute("culture").Value = value; }
+        }
+    }
+}
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentErrorsElement : RawXmlConfigurationElement
+    {
+        
+        public IEnumerable<IContentErrorPage> Error404Collection
+        {
+            get
+            {
+                var result = new ContentError404Collection();
+                if (RawXml != null)
+                {
+                    var e404 = RawXml.Elements("error404").First();
+                    var ePages = e404.Elements("errorPage").ToArray();                    
+                    if (ePages.Any())
+                    {
+                        //there are multiple
+                        foreach (var e in ePages)
+                        {
+                            result.Add(new ContentErrorPageElement(e)
+                            {
+                                Culture = (string)e.Attribute("culture"),
+                                RawValue = e.Value
+                            });
+                        }
+                    }
+                    else
+                    {
+                        //there's only one defined
+                        result.Add(new ContentErrorPageElement(e404)
+                        {
+                            RawValue = e404.Value
+                        });
+                    }                    
+                }
+                return result;
+            }
+        }
+
+    }
+}
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingElement : ConfigurationElement
+    {
+        [ConfigurationProperty("imageFileTypes")]
+        internal CommaDelimitedConfigurationElement ImageFileTypes
+        {
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (CommaDelimitedConfigurationElement)this["imageFileTypes"],
+                        //set the default
+                       GetDefaultImageFileTypes());
+            }
+        }
+
+        internal static string[] GetDefaultImageFileTypes()
+        {
+            return new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
+        }
+
+        [ConfigurationProperty("allowedAttributes")]
+        internal CommaDelimitedConfigurationElement ImageTagAllowedAttributes
+        {
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (CommaDelimitedConfigurationElement)this["allowedAttributes"],
+                        //set the default
+                       new[] { "src", "alt", "border", "class", "style", "align", "id", "name", "onclick", "usemap" });
+            }
+        }
+
+        private ImagingAutoFillPropertiesCollection _defaultImageAutoFill;
+
+        [ConfigurationCollection(typeof(ImagingAutoFillPropertiesCollection), AddItemName = "uploadField")]
+        [ConfigurationProperty("autoFillImageProperties", IsDefaultCollection = true)]
+        internal ImagingAutoFillPropertiesCollection ImageAutoFillProperties
+        {
+            get
+            {
+                if (_defaultImageAutoFill != null)
+                {
+                    return _defaultImageAutoFill;
+                }
+
+                //here we need to check if this element is defined, if it is not then we'll setup the defaults
+                var prop = Properties["autoFillImageProperties"];
+                var autoFill = this[prop] as ConfigurationElement;
+                if (autoFill != null && autoFill.ElementInformation.IsPresent == false)
+                {
+                    _defaultImageAutoFill = new ImagingAutoFillPropertiesCollection
+                        {
+                            new ImagingAutoFillUploadFieldElement
+                                {
+                                    Alias = "umbracoFile"
+                                }
+                        };
+                    return _defaultImageAutoFill;
+                }
+                
+                return (ImagingAutoFillPropertiesCollection) base["autoFillImageProperties"];
+            }
+        }
+
+        internal static ImagingAutoFillPropertiesCollection GetDefaultImageAutoFillProperties()
+        {
+            return new ImagingAutoFillPropertiesCollection
+                        {
+                            new ImagingAutoFillUploadFieldElement
+                                {
+                                    Alias = "umbracoFile"
+                                }
+                        };
+        }
+
+    }
+}
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentScriptEditorElement : ConfigurationElement
+    {
+        [ConfigurationProperty("scriptFolderPath")]
+        internal InnerTextConfigurationElement<string> ScriptFolderPath
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["scriptFolderPath"],
+                    //set the default
+                       "/scripts");
+            }
+        }
+
+        [ConfigurationProperty("scriptFileTypes")]
+        internal OptionalCommaDelimitedConfigurationElement ScriptFileTypes
+        {
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (OptionalCommaDelimitedConfigurationElement)this["scriptFileTypes"],
+                    //set the default
+                       new[] { "js", "xml" });                
+            }
+        }
+
+        [ConfigurationProperty("scriptDisableEditor")]
+        internal InnerTextConfigurationElement<bool> ScriptEditorDisable
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>) this["scriptDisableEditor"],
+                    //set the default
+                    false);
+            }
+        }
+
+    }
+}
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    /// <summary>
+    /// Allows for converting string representations of 0 and 1 to boolean
+    /// </summary>
+    internal class CustomBooleanTypeConverter : BooleanConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+            {
+                return true;
+            }
+            return base.CanConvertFrom(context, sourceType);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                var str = (string)value;
+                if (str == "1") return true;
+                if (str == "0" || str == "") return false;
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+    }
+}
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class DeveloperElement : ConfigurationElement, IDeveloperSection
+    {
+        private AppCodeFileExtensionsElement _default;
+
+        [ConfigurationProperty("appCodeFileExtensions")]
+        internal AppCodeFileExtensionsElement AppCodeFileExtensions
+        {
+            get
+            {
+                if (_default != null)
+                {
+                    return _default;
+                }
+
+                //here we need to check if this element is defined, if it is not then we'll setup the defaults
+                var prop = Properties["appCodeFileExtensions"];
+                var autoFill = this[prop] as ConfigurationElement;
+                if (autoFill != null && autoFill.ElementInformation.IsPresent == false)
+                {
+                    var collection = new AppCodeFileExtensionsCollection
+                        {
+                            new FileExtensionElement {RawValue = "cs"},
+                            new FileExtensionElement {RawValue = "vb"}
+                        };
+                    _default = new AppCodeFileExtensionsElement
+                        {
+                            AppCodeFileExtensionsCollection = collection
+                        };
+
+                    return _default;
+                }
+
+                return (AppCodeFileExtensionsElement)base["appCodeFileExtensions"];
+            }
+        }
+
+        IEnumerable<IFileExtension> IDeveloperSection.AppCodeFileExtensions
+        {
+            get { return AppCodeFileExtensions.AppCodeFileExtensionsCollection; }
+        }
+    }
+}
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class DisabledLogTypesCollection : ConfigurationElementCollection, IEnumerable<ILogType>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new LogTypeElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((LogTypeElement)element).Value;
+        }
+
+        IEnumerator<ILogType> IEnumerable<ILogType>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as ILogType;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class DistributedCallElement : ConfigurationElement, IDistributedCallSection
+    {
+        [ConfigurationProperty("enable", DefaultValue = false)]
+        internal bool Enabled
+        {
+            get { return (bool)base["enable"]; }
+        }
+
+        [ConfigurationProperty("user")]
+        internal InnerTextConfigurationElement<int> UserId
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<int>(
+                       (InnerTextConfigurationElement<int>)this["user"],
+                    //set the default
+                       0);
+            }
+        }
+
+        [ConfigurationCollection(typeof(ServerCollection), AddItemName = "server")]
+        [ConfigurationProperty("servers", IsDefaultCollection = true)]
+        internal ServerCollection Servers
+        {
+            get { return (ServerCollection)base["servers"]; }
+        }
+
+        bool IDistributedCallSection.Enabled
+        {
+            get { return Enabled; }
+        }
+
+        int IDistributedCallSection.UserId
+        {
+            get { return UserId; }
+        }
+
+        IEnumerable<IServer> IDistributedCallSection.Servers
+        {
+            get { return Servers; }
+        }
+    }
+}
@@ -0,0 +1,25 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ExternalLoggerElement : ConfigurationElement
+    {
+        [ConfigurationProperty("assembly")]
+        internal string Assembly
+        {
+            get { return (string)base["assembly"]; }
+        }
+
+        [ConfigurationProperty("type")]
+        internal string Type
+        {
+            get { return (string)base["type"]; }
+        }
+
+        [ConfigurationProperty("logAuditTrail")]
+        internal bool LogAuditTrail
+        {
+            get { return (bool)base["logAuditTrail"]; }
+        }
+    }
+}
@@ -0,0 +1,21 @@
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class FileExtensionElement : InnerTextConfigurationElement<string>, IFileExtension
+    {
+        public FileExtensionElement()
+        {
+        }
+
+        internal FileExtensionElement(XElement rawXml)
+            : base(rawXml)
+        {
+        }
+        
+        string IFileExtension.Extension
+        {
+            get { return Value; }
+        }
+    }
+}
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class HelpElement : ConfigurationElement, IHelpSection
+    {
+        [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")]
+        public string DefaultUrl
+        {
+            get { return (string) base["defaultUrl"]; }
+        }
+
+        [ConfigurationCollection(typeof (LinksCollection), AddItemName = "link")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public LinksCollection Links
+        {
+            get { return (LinksCollection) base[""]; }
+        }
+
+        string IHelpSection.DefaultUrl
+        {
+            get { return DefaultUrl; }
+        }
+
+        IEnumerable<ILink> IHelpSection.Links
+        {
+            get { return Links; }
+        }
+    }
+}
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IChar
+    {
+        string Char { get; }
+        string Replacement { get; }
+    }
+}
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentErrorPage
+    {
+        int ContentId { get; }
+        string Culture { get; set; }
+    }
+}
@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentSection : IUmbracoConfigurationSection
+    {
+        string NotificationEmailAddress { get; }
+
+        bool DisableHtmlEmail { get; }
+
+        IEnumerable<string> ImageFileTypes { get; }
+
+        IEnumerable<string> ImageTagAllowedAttributes { get; }
+
+        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
+
+        string ScriptFolderPath { get; }
+
+        IEnumerable<string> ScriptFileTypes { get; }
+
+        bool ScriptEditorDisable { get; }
+
+        bool ResolveUrlsFromTextString { get; }
+
+        bool UploadAllowDirectories { get; }
+
+        IEnumerable<IContentErrorPage> Error404Collection { get; }
+
+        bool EnsureUniqueNaming { get; }
+
+        bool TidyEditorContent { get; }
+
+        string TidyCharEncoding { get; }
+
+        bool XmlCacheEnabled { get; }
+
+        bool ContinouslyUpdateXmlDiskCache { get; }
+
+        bool XmlContentCheckForDiskChanges { get; }
+
+        bool EnableSplashWhileLoading { get; }
+
+        string PropertyContextHelpOption { get; }
+
+        bool UseLegacyXmlSchema { get; }
+
+        bool ForceSafeAliases { get; }
+
+        string PreviewBadge { get; }
+
+        int UmbracoLibraryCacheDuration { get; }
+
+        MacroErrorBehaviour MacroErrorBehaviour { get; }
+        
+        IEnumerable<string> DisallowedUploadFiles { get; }
+
+        bool CloneXmlContent { get; }
+
+        bool GlobalPreviewStorageEnabled { get; }
+
+        string DefaultDocumentTypeProperty { get; }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDeveloperSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
+    }
+}
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDistributedCallSection : IUmbracoConfigurationSection
+    {
+        bool Enabled { get; }
+
+        int UserId { get; }
+
+        IEnumerable<IServer> Servers { get; }
+    }
+}
--- a/Show More
+++ b/Show More