cleaner fix

Shazwazza · Shazwazza · commit a855a90a8a5b · 2020-03-26T22:09:49.000+11:00
diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
@@ -37,28 +37,13 @@ public override object Get(string key, Func<object> factory)
         /// <inheritdoc />
         public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            return Get(key, factory, timeout, isSliding, priority, removedCallback,
-                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
-                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
-                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
-                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
-                // Init is called as part of the ctor!! yikes.
-                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
-                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
+            return GetInternal(key, factory, timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
         /// <inheritdoc />
         public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            
-            Insert(key, factory, timeout, isSliding, priority, removedCallback,
-                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
-                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
-                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
-                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
-                // Init is called as part of the ctor!! yikes.
-                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
-                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
+            InsertInternal(key, factory, timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
         #region Dictionary
@@ -108,7 +93,7 @@ protected override void ExitWriteLock()
 
         #endregion
 
-        private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
+        private object GetInternal(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             key = GetCacheKey(key);
 
@@ -168,8 +153,12 @@ private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isS
                     var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
 
                     lck.UpgradeToWriteLock();
+
+                    // create a cache dependency if one is needed. 
+                    var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;
+
                     //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency(), absolute, sliding, priority, removedCallback);
+                    _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
                 }
             }
 
@@ -185,7 +174,7 @@ private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isS
             return value;
         }
 
-        private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
+        private void InsertInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
             // and make sure we don't store a null value.
@@ -202,8 +191,12 @@ private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeou
             try
             {
                 _locker.EnterWriteLock();
+
+                // create a cache dependency if one is needed. 
+                var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;
+
                 //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                _cache.Insert(cacheKey, result, dependency(), absolute, sliding, priority, removedCallback);
+                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
             }
             finally
             {
