More MemoryCache perf improvements

src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -215,12 +216,17 @@ public void Dispose()
                 if (_valueHasBeenSet)
                 {
                     _notifyCacheEntryCommit(this);
-                    PropagateOptions(CacheEntryHelper.Current);
+
+                    if (CanPropagateOptions())
+                    {
+                        PropagateOptions(CacheEntryHelper.Current);
+                    }
                 }
             }
         }
 
-        internal bool CheckExpired(DateTimeOffset now)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal bool CheckExpired(in DateTimeOffset now)
         {
             return _isExpired || CheckForExpiredTime(now) || CheckForExpiredTokens();
         }
@@ -235,27 +241,44 @@ internal void SetExpired(EvictionReason reason)
             DetachTokens();
         }
 
-        private bool CheckForExpiredTime(DateTimeOffset now)
+        private bool CheckForExpiredTime(in DateTimeOffset now)
         {
-            if (_absoluteExpiration.HasValue && _absoluteExpiration.Value <= now)
+            if (!_absoluteExpiration.HasValue && !_slidingExpiration.HasValue)
             {
-                SetExpired(EvictionReason.Expired);
-                return true;
+                return false;
             }
 
-            if (_slidingExpiration.HasValue
-                && (now - LastAccessed) >= _slidingExpiration)
+            return FullCheck(now);
+
+            bool FullCheck(in DateTimeOffset offset)
             {
-                SetExpired(EvictionReason.Expired);
-                return true;
-            }
+                if (_absoluteExpiration.HasValue && _absoluteExpiration.Value <= offset)
+                {
+                    SetExpired(EvictionReason.Expired);
+                    return true;
+                }
 
-            return false;
+                if (_slidingExpiration.HasValue
+                    && (offset - LastAccessed) >= _slidingExpiration)
+                {
+                    SetExpired(EvictionReason.Expired);
+                    return true;
+                }
+
+                return false;
+            }
         }
 
-        internal bool CheckForExpiredTokens()
+        private bool CheckForExpiredTokens()
         {
-            if (_expirationTokens != null)
+            if (_expirationTokens == null)
+            {
+                return false;
+            }
+
+            return CheckTokens();
+
+            bool CheckTokens()
             {
                 for (int i = 0; i < _expirationTokens.Count; i++)
                 {
@@ -266,8 +289,8 @@ internal bool CheckForExpiredTokens()
                         return true;
                     }
                 }
+                return false;
             }
-            return false;
         }
 
         internal void AttachTokens()
@@ -355,6 +378,8 @@ private static void InvokeCallbacks(CacheEntry entry)
             }
         }
 
+        internal bool CanPropagateOptions() => _expirationTokens != null || _absoluteExpiration.HasValue;
+
         internal void PropagateOptions(CacheEntry parent)
         {
             if (parent == null)

src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs

@@ -250,9 +250,12 @@ public bool TryGetValue(object key, out object result)
                     entry.LastAccessed = utcNow;
                     result = entry.Value;
 
-                    // When this entry is retrieved in the scope of creating another entry,
-                    // that entry needs a copy of these expiration tokens.
-                    entry.PropagateOptions(CacheEntryHelper.Current);
+                    if (entry.CanPropagateOptions())
+                    {
+                        // When this entry is retrieved in the scope of creating another entry,
+                        // that entry needs a copy of these expiration tokens.
+                        entry.PropagateOptions(CacheEntryHelper.Current);
+                    }
 
                     StartScanForExpiredItemsIfNeeded(utcNow);