Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Linq;
 using System.Threading;
 using System.Web;
@@ -23,6 +24,11 @@ namespace Umbraco.Core.Cache
         }
 
         protected override DictionaryCacheWrapper DictionaryCache
+        {
+            get { return _wrapper; }
+        }
+
+        /// <summary>
         /// Clears all objects in the System.Web.Cache with the System.Type specified that satisfy the predicate
         /// </summary>
         public override void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
@@ -49,11 +55,6 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <summary>
-        {
-            get { return _wrapper; }
-        }
-
         /// <summary>
         /// Gets (and adds if necessary) an item from the cache with all of the default parameters
         /// </summary>