Revert "Temp8 tinymce"

src/Umbraco.Core/Cache/DeepCloneRuntimeCacheProvider.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Caching;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Cache
 {
@@ -16,26 +16,23 @@ namespace Umbraco.Core.Cache
     }
 
     /// <summary>
-    /// A wrapper for any IRuntimeCacheProvider that ensures that all inserts and returns
+    /// A wrapper for any IRuntimeCacheProvider that ensures that all inserts and returns 
     /// are a deep cloned copy of the item when the item is IDeepCloneable and that tracks changes are
     /// reset if the object is TracksChangesEntityBase
     /// </summary>
     internal class DeepCloneRuntimeCacheProvider : IRuntimeCacheProvider, IRuntimeCacheProviderWrapper
     {
-        public IRuntimeCacheProvider InnerProvider { get; }
+        public IRuntimeCacheProvider InnerProvider { get; private set; }
 
         public DeepCloneRuntimeCacheProvider(IRuntimeCacheProvider innerProvider)
         {
-            var type = typeof (DeepCloneRuntimeCacheProvider);
-
-            if (innerProvider.GetType() == type)
-                throw new InvalidOperationException($"A {type} cannot wrap another instance of {type}.");
+            if (innerProvider.GetType() == typeof(DeepCloneRuntimeCacheProvider))
+                throw new InvalidOperationException("A " + typeof(DeepCloneRuntimeCacheProvider) + " cannot wrap another instance of " + typeof(DeepCloneRuntimeCacheProvider));
 
             InnerProvider = innerProvider;
         }
 
         #region Clear - doesn't require any changes
-
         public void ClearAllCache()
         {
             InnerProvider.ClearAllCache();
@@ -69,8 +66,7 @@ namespace Umbraco.Core.Cache
         public void ClearCacheByKeyExpression(string regexString)
         {
             InnerProvider.ClearCacheByKeyExpression(regexString);
-        }
-
+        } 
         #endregion
 
         public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
@@ -84,7 +80,7 @@ namespace Umbraco.Core.Cache
             return InnerProvider.GetCacheItemsByKeyExpression(regexString)
                 .Select(CheckCloneableAndTracksChanges);
         }
-
+        
         public object GetCacheItem(string cacheKey)
         {
             var item = InnerProvider.GetCacheItem(cacheKey);
@@ -112,11 +108,11 @@ namespace Umbraco.Core.Cache
                 var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                 if (value == null) return null; // do not store null values (backward compat)
 
-                // clone / reset to go into the cache
+                //Clone/reset to go into the cache
                 return CheckCloneableAndTracksChanges(value);
             }, timeout, isSliding, priority, removedCallback, dependentFiles);
 
-            // clone / reset to go into the cache
+            //Clone/reset to go out of the cache
             return CheckCloneableAndTracksChanges(cached);
         }
 
@@ -128,9 +124,8 @@ namespace Umbraco.Core.Cache
                 var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                 if (value == null) return null; // do not store null values (backward compat)
 
-                // clone / reset to go into the cache
                 return CheckCloneableAndTracksChanges(value);
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);
+            }, timeout, isSliding, priority, removedCallback, dependentFiles);   
         }
 
         private static object CheckCloneableAndTracksChanges(object input)
@@ -138,10 +133,11 @@ namespace Umbraco.Core.Cache
             var cloneable = input as IDeepCloneable;
             if (cloneable != null)
             {
-                input = cloneable.DeepClone();
+                input = cloneable.DeepClone();    
             }
 
-            // reset dirty initial properties (U4-1946)
+            //on initial construction we don't want to have dirty properties tracked
+            // http://issues.umbraco.org/issue/U4-1946
             var tracksChanges = input as IRememberBeingDirty;
             if (tracksChanges != null)
             {
@@ -152,4 +148,4 @@ namespace Umbraco.Core.Cache
             return input;
         }
     }
-}
+}