diff --git a/src/QueryCache.Core/PublicAPI/PublicAPI.Shipped.txt b/src/QueryCache.Core/PublicAPI/PublicAPI.Shipped.txt
index 7dc5c58..5c6173d 100644
--- a/src/QueryCache.Core/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/QueryCache.Core/PublicAPI/PublicAPI.Shipped.txt
@@ -1 +1,18 @@
 #nullable enable
+QueryCache.QueryCacheStore
+QueryCache.QueryKey
+QueryCache.QueryKey.Equals(QueryCache.QueryKey? other) -> bool
+QueryCache.QueryKey.QueryKey(string! text, params System.Collections.Generic.IEnumerable<object?>! values) -> void
+const QueryCache.QueryCacheStore.MeterName = "QueryCache" -> string!
+override QueryCache.QueryKey.Equals(object? obj) -> bool
+override QueryCache.QueryKey.GetHashCode() -> int
+override QueryCache.QueryKey.ToString() -> string!
+static QueryCache.QueryCacheStore.Capacity.get -> int
+static QueryCache.QueryCacheStore.Capacity.set -> void
+static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Collections.Generic.IReadOnlyCollection<string!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
+static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Func<System.Collections.Generic.IReadOnlyCollection<string!>!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
+static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
+static QueryCache.QueryCacheStore.HybridCache.get -> Microsoft.Extensions.Caching.Hybrid.HybridCache?
+static QueryCache.QueryCacheStore.HybridCache.set -> void
+static QueryCache.QueryCacheStore.InvalidateTagsAsync(System.Collections.Generic.IEnumerable<string!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+static QueryCache.QueryCacheStore.RemoveAsync<T>(QueryCache.QueryKey! key, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
diff --git a/src/QueryCache.Core/PublicAPI/PublicAPI.Unshipped.txt b/src/QueryCache.Core/PublicAPI/PublicAPI.Unshipped.txt
index 5c6173d..7dc5c58 100644
--- a/src/QueryCache.Core/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/QueryCache.Core/PublicAPI/PublicAPI.Unshipped.txt
@@ -1,18 +1 @@
 #nullable enable
-QueryCache.QueryCacheStore
-QueryCache.QueryKey
-QueryCache.QueryKey.Equals(QueryCache.QueryKey? other) -> bool
-QueryCache.QueryKey.QueryKey(string! text, params System.Collections.Generic.IEnumerable<object?>! values) -> void
-const QueryCache.QueryCacheStore.MeterName = "QueryCache" -> string!
-override QueryCache.QueryKey.Equals(object? obj) -> bool
-override QueryCache.QueryKey.GetHashCode() -> int
-override QueryCache.QueryKey.ToString() -> string!
-static QueryCache.QueryCacheStore.Capacity.get -> int
-static QueryCache.QueryCacheStore.Capacity.set -> void
-static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Collections.Generic.IReadOnlyCollection<string!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
-static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Func<System.Collections.Generic.IReadOnlyCollection<string!>!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
-static QueryCache.QueryCacheStore.GetOrAddAsync<T>(QueryCache.QueryKey! key, System.TimeSpan expiration, System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task<T>!>! factory, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
-static QueryCache.QueryCacheStore.HybridCache.get -> Microsoft.Extensions.Caching.Hybrid.HybridCache?
-static QueryCache.QueryCacheStore.HybridCache.set -> void
-static QueryCache.QueryCacheStore.InvalidateTagsAsync(System.Collections.Generic.IEnumerable<string!>! tags, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
-static QueryCache.QueryCacheStore.RemoveAsync<T>(QueryCache.QueryKey! key, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
diff --git a/src/QueryCache.Dapper/PublicAPI/PublicAPI.Shipped.txt b/src/QueryCache.Dapper/PublicAPI/PublicAPI.Shipped.txt
index 7dc5c58..2a31cbe 100644
--- a/src/QueryCache.Dapper/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/QueryCache.Dapper/PublicAPI/PublicAPI.Shipped.txt
@@ -1 +1,15 @@
 #nullable enable
+QueryCache.Dapper.DapperCacheQuery<T>
+QueryCache.Dapper.DapperCacheQuery<T>.DapperCacheQuery(System.Data.Common.DbConnection! connection, Dapper.CommandDefinition command) -> void
+QueryCache.Dapper.DapperCacheQuery<T>.Equals(QueryCache.Dapper.DapperCacheQuery<T>? other) -> bool
+QueryCache.Dapper.DapperCacheQuery<T>.ExecuteScalarAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
+QueryCache.Dapper.DapperCacheQuery<T>.InvalidateCacheAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+QueryCache.Dapper.DapperCacheQuery<T>.QueryAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.IReadOnlyList<T>!>
+QueryCache.Dapper.DapperCacheQuery<T>.QueryFirstOrDefaultAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
+QueryCache.Dapper.DapperCacheQueryExtensions
+override QueryCache.Dapper.DapperCacheQuery<T>.Equals(object? obj) -> bool
+override QueryCache.Dapper.DapperCacheQuery<T>.GetHashCode() -> int
+override QueryCache.Dapper.DapperCacheQuery<T>.ToString() -> string!
+static QueryCache.Dapper.DapperCacheQuery<T>.operator !=(QueryCache.Dapper.DapperCacheQuery<T>? left, QueryCache.Dapper.DapperCacheQuery<T>? right) -> bool
+static QueryCache.Dapper.DapperCacheQuery<T>.operator ==(QueryCache.Dapper.DapperCacheQuery<T>? left, QueryCache.Dapper.DapperCacheQuery<T>? right) -> bool
+static QueryCache.Dapper.DapperCacheQueryExtensions.ToCacheQuery<T>(this System.Data.Common.DbConnection! connection, Dapper.CommandDefinition command) -> QueryCache.Dapper.DapperCacheQuery<T>!
diff --git a/src/QueryCache.Dapper/PublicAPI/PublicAPI.Unshipped.txt b/src/QueryCache.Dapper/PublicAPI/PublicAPI.Unshipped.txt
index 2a31cbe..7dc5c58 100644
--- a/src/QueryCache.Dapper/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/QueryCache.Dapper/PublicAPI/PublicAPI.Unshipped.txt
@@ -1,15 +1 @@
 #nullable enable
-QueryCache.Dapper.DapperCacheQuery<T>
-QueryCache.Dapper.DapperCacheQuery<T>.DapperCacheQuery(System.Data.Common.DbConnection! connection, Dapper.CommandDefinition command) -> void
-QueryCache.Dapper.DapperCacheQuery<T>.Equals(QueryCache.Dapper.DapperCacheQuery<T>? other) -> bool
-QueryCache.Dapper.DapperCacheQuery<T>.ExecuteScalarAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
-QueryCache.Dapper.DapperCacheQuery<T>.InvalidateCacheAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
-QueryCache.Dapper.DapperCacheQuery<T>.QueryAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.IReadOnlyList<T>!>
-QueryCache.Dapper.DapperCacheQuery<T>.QueryFirstOrDefaultAsync(System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
-QueryCache.Dapper.DapperCacheQueryExtensions
-override QueryCache.Dapper.DapperCacheQuery<T>.Equals(object? obj) -> bool
-override QueryCache.Dapper.DapperCacheQuery<T>.GetHashCode() -> int
-override QueryCache.Dapper.DapperCacheQuery<T>.ToString() -> string!
-static QueryCache.Dapper.DapperCacheQuery<T>.operator !=(QueryCache.Dapper.DapperCacheQuery<T>? left, QueryCache.Dapper.DapperCacheQuery<T>? right) -> bool
-static QueryCache.Dapper.DapperCacheQuery<T>.operator ==(QueryCache.Dapper.DapperCacheQuery<T>? left, QueryCache.Dapper.DapperCacheQuery<T>? right) -> bool
-static QueryCache.Dapper.DapperCacheQueryExtensions.ToCacheQuery<T>(this System.Data.Common.DbConnection! connection, Dapper.CommandDefinition command) -> QueryCache.Dapper.DapperCacheQuery<T>!
diff --git a/src/QueryCache.EFCore/PublicAPI/PublicAPI.Shipped.txt b/src/QueryCache.EFCore/PublicAPI/PublicAPI.Shipped.txt
index 7dc5c58..815063e 100644
--- a/src/QueryCache.EFCore/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/QueryCache.EFCore/PublicAPI/PublicAPI.Shipped.txt
@@ -1 +1,17 @@
 #nullable enable
+QueryCache.EFCore.QueryCacheInvalidation
+QueryCache.EFCore.QueryableCacheExtensions
+static QueryCache.EFCore.QueryCacheInvalidation.UseQueryCacheInvalidation(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder! builder) -> Microsoft.EntityFrameworkCore.DbContextOptionsBuilder!
+static QueryCache.EFCore.QueryCacheInvalidation.UseQueryCacheInvalidation<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext!>! builder) -> Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext!>!
+static QueryCache.EFCore.QueryableCacheExtensions.AnyCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<bool>
+static QueryCache.EFCore.QueryableCacheExtensions.CountCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<int>
+static QueryCache.EFCore.QueryableCacheExtensions.FirstCachedAsync<T>(this System.Linq.IQueryable<T!>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T!>
+static QueryCache.EFCore.QueryableCacheExtensions.FirstOrDefaultCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
+static QueryCache.EFCore.QueryableCacheExtensions.InvalidateCacheAsync<T>(this System.Linq.IQueryable<T>! query, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+static QueryCache.EFCore.QueryableCacheExtensions.MaxCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
+static QueryCache.EFCore.QueryableCacheExtensions.SingleOrDefaultCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
+static QueryCache.EFCore.QueryableCacheExtensions.SumCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
+static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey, TValue>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.Func<T, TValue>! valueSelector, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, TValue>!>
+static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.Collections.Generic.IEqualityComparer<TKey>! comparer, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, T>!>
+static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, T>!>
+static QueryCache.EFCore.QueryableCacheExtensions.ToListCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.IReadOnlyList<T>!>
diff --git a/src/QueryCache.EFCore/PublicAPI/PublicAPI.Unshipped.txt b/src/QueryCache.EFCore/PublicAPI/PublicAPI.Unshipped.txt
index 815063e..7dc5c58 100644
--- a/src/QueryCache.EFCore/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/QueryCache.EFCore/PublicAPI/PublicAPI.Unshipped.txt
@@ -1,17 +1 @@
 #nullable enable
-QueryCache.EFCore.QueryCacheInvalidation
-QueryCache.EFCore.QueryableCacheExtensions
-static QueryCache.EFCore.QueryCacheInvalidation.UseQueryCacheInvalidation(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder! builder) -> Microsoft.EntityFrameworkCore.DbContextOptionsBuilder!
-static QueryCache.EFCore.QueryCacheInvalidation.UseQueryCacheInvalidation<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext!>! builder) -> Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext!>!
-static QueryCache.EFCore.QueryableCacheExtensions.AnyCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<bool>
-static QueryCache.EFCore.QueryableCacheExtensions.CountCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<int>
-static QueryCache.EFCore.QueryableCacheExtensions.FirstCachedAsync<T>(this System.Linq.IQueryable<T!>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T!>
-static QueryCache.EFCore.QueryableCacheExtensions.FirstOrDefaultCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
-static QueryCache.EFCore.QueryableCacheExtensions.InvalidateCacheAsync<T>(this System.Linq.IQueryable<T>! query, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
-static QueryCache.EFCore.QueryableCacheExtensions.MaxCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
-static QueryCache.EFCore.QueryableCacheExtensions.SingleOrDefaultCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T?>
-static QueryCache.EFCore.QueryableCacheExtensions.SumCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<T>
-static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey, TValue>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.Func<T, TValue>! valueSelector, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, TValue>!>
-static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.Collections.Generic.IEqualityComparer<TKey>! comparer, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, T>!>
-static QueryCache.EFCore.QueryableCacheExtensions.ToDictionaryCachedAsync<T, TKey>(this System.Linq.IQueryable<T>! query, System.Func<T, TKey>! keySelector, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.Dictionary<TKey, T>!>
-static QueryCache.EFCore.QueryableCacheExtensions.ToListCachedAsync<T>(this System.Linq.IQueryable<T>! query, System.TimeSpan expiration, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<System.Collections.Generic.IReadOnlyList<T>!>