Dispose IDisposables

Author: VahidN

src/EFCoreSecondLevelCacheInterceptor.FusionCache/EFFusionCacheProvider.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 using ZiggyCreatures.Caching.Fusion;
 
@@ -8,11 +6,13 @@ namespace EFCoreSecondLevelCacheInterceptor;
 /// <remarks>
 ///     Using FusionCache as a cache service.
 /// </remarks>
-public class EFFusionCacheProvider : IEFCacheServiceProvider
+public sealed class EFFusionCacheProvider : IEFCacheServiceProvider, IDisposable
 {
     private readonly IFusionCache _fusionCache;
     private readonly IEFDebugLogger _logger;
 
+    private bool _disposed;
+
     /// <remarks>
     ///     Using FusionCache as a cache service.
     /// </remarks>
@@ -32,6 +32,18 @@ public EFFusionCacheProvider(IFusionCacheProvider fusionCacheProvider,
         _logger = logger;
     }
 
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _fusionCache.Dispose();
+        _disposed = true;
+    }
+
     /// <summary>
     ///     Adds a new item to the cache.
     /// </summary>

src/EFCoreSecondLevelCacheInterceptor.MemoryCache/EFMemoryCacheChangeTokenProvider.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Concurrent;
-using System.Threading;
 using Microsoft.Extensions.Primitives;
 
 namespace EFCoreSecondLevelCacheInterceptor;
@@ -24,10 +22,13 @@ public EFMemoryCacheChangeTokenProvider()
     public IChangeToken GetChangeToken(string key)
         => _changeTokens.GetOrAdd(key, _ =>
             {
+                // We will dispose the CancellationTokenSource when you are done with it in the RemoveChangeToken method.
+#pragma warning disable IDISP001
                 var cancellationTokenSource = new CancellationTokenSource();
                 var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
 
                 return new ChangeTokenInfo(changeToken, cancellationTokenSource);
+#pragma warning restore IDISP001
             })
             .ChangeToken;
 
@@ -39,6 +40,11 @@ public void RemoveChangeToken(string key)
         if (_changeTokens.TryRemove(key, out var changeTokenInfo))
         {
             changeTokenInfo.TokenSource.Cancel();
+
+            // Our current code (with disposal in RemoveChangeToken) is correct because we create the CancellationTokenSource with new inside our class. 
+#pragma warning disable IDISP007
+            changeTokenInfo.TokenSource.Dispose();
+#pragma warning restore IDISP007
         }
     }