Reclaim entries that expire during mismatching comparisons

Author: niemyjski

src/Foundatio/Caching/InMemoryCacheClient.cs

@@ -394,17 +394,19 @@ private TResult UpdateLease<TResult>(string key, Func<CacheEntry, (CacheEntry? E
         var result = UpdateEntry(key, current =>
         {
             reclaimed = false;
-            if (current is null || update(current) is not { } decision)
+            if (current is null)
                 return (current, missResult);
 
+            var decision = update(current);
+
             // A lease that expired while it was being compared no longer belongs to the caller: reclaim it
             if (current.IsExpired)
             {
                 reclaimed = true;
                 return (null, missResult);
             }
 
-            return decision;
+            return decision ?? (current, missResult);
         });
 
         if (reclaimed)

tests/Foundatio.Tests/Caching/InMemoryCacheClientTests.cs

@@ -1063,6 +1063,8 @@ public async Task RemoveIfEqualAsync_WhenEntryExpiresDuringComparison_ReturnsFal
     [InlineData(true, true, false)]
     [InlineData(false, false, true)]
     [InlineData(false, true, true)]
+    [InlineData(true, false, true)]
+    [InlineData(true, true, true)]
     public async Task RemoveIfEqualAsync_WhenEntryExpires_ReclaimsMemoryAndNotifies(bool expiresDuringComparison, bool matches, bool recentMaintenance)
     {
         // Arrange