Pull public methods/properties to IMemoryCache

Author: thomasgalliker

HttpClient.Caching/InMemory/IMemoryCache.cs

@@ -8,6 +8,8 @@ namespace Microsoft.Extensions.Caching.InMemory
     /// </summary>
     public interface IMemoryCache : IDisposable
     {
+        int Count { get; }
+
         /// <summary>Gets the item associated with this key if present.</summary>
         /// <param name="key">An object identifying the requested entry.</param>
         /// <param name="value">The located value or null.</param>
@@ -23,6 +25,8 @@ public interface IMemoryCache : IDisposable
         /// <param name="key">An object identifying the entry.</param>
         void Remove(object key);
 
+        void Compact(double percentage);
+
         void Clear();
     }
 }

HttpClient.Caching/InMemory/MemoryCache.cs

@@ -12,12 +12,13 @@ namespace Microsoft.Extensions.Caching.InMemory
     public class MemoryCache : IMemoryCache
     {
         private readonly ConcurrentDictionary<object, CacheEntry> entries;
-        private bool disposed;
         private readonly Action<CacheEntry> setEntry;
         private readonly Action<CacheEntry> entryExpirationNotification;
         private readonly ISystemClock clock;
         private readonly TimeSpan expirationScanFrequency;
+
         private DateTimeOffset lastExpirationScan;
+        private bool disposed;
 
         public int Count => this.entries.Count;
 
@@ -110,10 +111,7 @@ private void SetEntry(CacheEntry entry)
                     entry.InvokeEvictionCallbacks();
                 }
 
-                if (cacheEntry != null)
-                {
-                    cacheEntry.InvokeEvictionCallbacks();
-                }
+                cacheEntry?.InvokeEvictionCallbacks();
             }
             else
             {