diff --git a/src/Imageflow.Server.HybridCache/PublicAPI.Shipped.txt b/src/Imageflow.Server.HybridCache/PublicAPI.Shipped.txt
index b142356..681c976 100644
--- a/src/Imageflow.Server.HybridCache/PublicAPI.Shipped.txt
+++ b/src/Imageflow.Server.HybridCache/PublicAPI.Shipped.txt
@@ -1,32 +1,4 @@
 #nullable enable
-Imageflow.Server.HybridCache.HybridCacheOptions
-Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeLimitInBytes.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeLimitInBytes.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeMb.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeMb.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.DatabaseShards.get -> int
-Imageflow.Server.HybridCache.HybridCacheOptions.DatabaseShards.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.EvictionSweepSizeMb.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.EvictionSweepSizeMb.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.MinAgeToDelete.get -> System.TimeSpan
-Imageflow.Server.HybridCache.HybridCacheOptions.MinAgeToDelete.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.MinCleanupBytes.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.MinCleanupBytes.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.QueueSizeLimitInBytes.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.QueueSizeLimitInBytes.set -> void
-Imageflow.Server.HybridCache.HybridCacheOptions.WriteQueueMemoryMb.get -> long
-Imageflow.Server.HybridCache.HybridCacheOptions.WriteQueueMemoryMb.set -> void
-Imageflow.Server.HybridCache.HybridCacheService
-Imageflow.Server.HybridCache.HybridCacheServiceExtensions
-~Imageflow.Server.HybridCache.HybridCacheOptions.DiskCacheDirectory.get -> string
-~Imageflow.Server.HybridCache.HybridCacheOptions.DiskCacheDirectory.set -> void
-~Imageflow.Server.HybridCache.HybridCacheOptions.HybridCacheOptions(string cacheDir) -> void
-~Imageflow.Server.HybridCache.HybridCacheService.GetIssues() -> System.Collections.Generic.IEnumerable<Imazen.Common.Issues.IIssue>
-~Imageflow.Server.HybridCache.HybridCacheService.GetOrCreateBytes(byte[] key, Imazen.Common.Extensibility.StreamCache.AsyncBytesResult dataProviderCallback, System.Threading.CancellationToken cancellationToken, bool retrieveContentType) -> System.Threading.Tasks.Task<Imazen.Common.Extensibility.StreamCache.IStreamCacheResult>
-~Imageflow.Server.HybridCache.HybridCacheService.HybridCacheService(Imageflow.Server.HybridCache.HybridCacheOptions options, Microsoft.Extensions.Logging.ILogger<Imageflow.Server.HybridCache.HybridCacheService> logger) -> void
-~Imageflow.Server.HybridCache.HybridCacheService.StartAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
-~Imageflow.Server.HybridCache.HybridCacheService.StopAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
-~static Imageflow.Server.HybridCache.HybridCacheServiceExtensions.AddImageflowHybridCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Imageflow.Server.HybridCache.HybridCacheOptions options) -> Microsoft.Extensions.DependencyInjection.IServiceCollectionImageflow.Server.HybridCache.HybridCacheOptions
 Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeLimitInBytes.get -> long
 Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeLimitInBytes.set -> void
 Imageflow.Server.HybridCache.HybridCacheOptions.CacheSizeMb.get -> long
diff --git a/src/Imazen.Common/PublicAPI.Shipped.txt b/src/Imazen.Common/PublicAPI.Shipped.txt
index 2d34e35..ccfc6b0 100644
--- a/src/Imazen.Common/PublicAPI.Shipped.txt
+++ b/src/Imazen.Common/PublicAPI.Shipped.txt
@@ -69,11 +69,11 @@ Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoProvider
 Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoProvider.Add(Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! accumulator) -> void
 Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions
 Imazen.Common.Issues.IIssue
-Imazen.Common.Issues.IIssue.Details.get -> string!
+Imazen.Common.Issues.IIssue.Details.get -> string?
 Imazen.Common.Issues.IIssue.Hash() -> int
 Imazen.Common.Issues.IIssue.Severity.get -> Imazen.Common.Issues.IssueSeverity
-Imazen.Common.Issues.IIssue.Source.get -> string!
-Imazen.Common.Issues.IIssue.Summary.get -> string!
+Imazen.Common.Issues.IIssue.Source.get -> string?
+Imazen.Common.Issues.IIssue.Summary.get -> string?
 Imazen.Common.Issues.IIssueProvider
 Imazen.Common.Issues.IIssueProvider.GetIssues() -> System.Collections.Generic.IEnumerable<Imazen.Common.Issues.IIssue!>!
 Imazen.Common.Issues.IIssueReceiver
@@ -142,47 +142,6 @@ Imazen.Common.Storage.BlobMissingException
 Imazen.Common.Storage.BlobMissingException.BlobMissingException() -> void
 Imazen.Common.Storage.BlobMissingException.BlobMissingException(string! message) -> void
 Imazen.Common.Storage.BlobMissingException.BlobMissingException(string! message, System.Exception! inner) -> void
-Imazen.Common.Storage.Caching.BlobGroup
-Imazen.Common.Storage.Caching.BlobGroup.CacheEntry = 0 -> Imazen.Common.Storage.Caching.BlobGroup
-Imazen.Common.Storage.Caching.BlobGroup.CacheMetadata = 1 -> Imazen.Common.Storage.Caching.BlobGroup
-Imazen.Common.Storage.Caching.BlobGroup.Essential = 3 -> Imazen.Common.Storage.Caching.BlobGroup
-Imazen.Common.Storage.Caching.BlobGroup.SourceMetadata = 2 -> Imazen.Common.Storage.Caching.BlobGroup
-Imazen.Common.Storage.Caching.CacheBlobFetchResult
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.CacheBlobFetchResult(Imazen.Common.Storage.Caching.ICacheBlobData! data, bool dataExists, int statusCode, string! statusMessage) -> void
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.Data.get -> Imazen.Common.Storage.Caching.ICacheBlobData!
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.DataExists.get -> bool
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.Dispose() -> void
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.StatusCode.get -> int
-Imazen.Common.Storage.Caching.CacheBlobFetchResult.StatusMessage.get -> string!
-Imazen.Common.Storage.Caching.CacheBlobPutOptions
-Imazen.Common.Storage.Caching.CacheBlobPutOptions.CacheBlobPutOptions() -> void
-Imazen.Common.Storage.Caching.CacheBlobPutResult
-Imazen.Common.Storage.Caching.CacheBlobPutResult.CacheBlobPutResult(int statusCode, string! statusMessage, bool success) -> void
-Imazen.Common.Storage.Caching.CacheBlobPutResult.StatusCode.get -> int
-Imazen.Common.Storage.Caching.CacheBlobPutResult.StatusMessage.get -> string!
-Imazen.Common.Storage.Caching.CacheBlobPutResult.Success.get -> bool
-Imazen.Common.Storage.Caching.IBlobCache
-Imazen.Common.Storage.Caching.IBlobCache.MayExist(Imazen.Common.Storage.Caching.BlobGroup group, string! key, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<bool>!
-Imazen.Common.Storage.Caching.IBlobCache.Put(Imazen.Common.Storage.Caching.BlobGroup group, string! key, Imazen.Common.Storage.IBlobData! data, Imazen.Common.Storage.Caching.ICacheBlobPutOptions! options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Imazen.Common.Storage.Caching.ICacheBlobPutResult!>!
-Imazen.Common.Storage.Caching.IBlobCache.TryFetchBlob(Imazen.Common.Storage.Caching.BlobGroup group, string! key, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Imazen.Common.Storage.Caching.ICacheBlobFetchResult!>!
-Imazen.Common.Storage.Caching.IBlobCacheProvider
-Imazen.Common.Storage.Caching.IBlobCacheProvider.GetCacheNames() -> System.Collections.Generic.IEnumerable<string!>!
-Imazen.Common.Storage.Caching.IBlobCacheProvider.TryGetCache(string! name, out Imazen.Common.Storage.Caching.IBlobCache! cache) -> bool
-Imazen.Common.Storage.Caching.IBlobCacheWithRenewals
-Imazen.Common.Storage.Caching.IBlobCacheWithRenewals.TryRenew(Imazen.Common.Storage.Caching.BlobGroup group, string! key, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Imazen.Common.Storage.Caching.ICacheBlobPutResult!>!
-Imazen.Common.Storage.Caching.ICacheBlobData
-Imazen.Common.Storage.Caching.ICacheBlobDataExpiry
-Imazen.Common.Storage.Caching.ICacheBlobDataExpiry.EstimatedExpiry.get -> System.DateTimeOffset?
-Imazen.Common.Storage.Caching.ICacheBlobFetchResult
-Imazen.Common.Storage.Caching.ICacheBlobFetchResult.Data.get -> Imazen.Common.Storage.Caching.ICacheBlobData!
-Imazen.Common.Storage.Caching.ICacheBlobFetchResult.DataExists.get -> bool
-Imazen.Common.Storage.Caching.ICacheBlobFetchResult.StatusCode.get -> int
-Imazen.Common.Storage.Caching.ICacheBlobFetchResult.StatusMessage.get -> string!
-Imazen.Common.Storage.Caching.ICacheBlobPutOptions
-Imazen.Common.Storage.Caching.ICacheBlobPutResult
-Imazen.Common.Storage.Caching.ICacheBlobPutResult.StatusCode.get -> int
-Imazen.Common.Storage.Caching.ICacheBlobPutResult.StatusMessage.get -> string!
-Imazen.Common.Storage.Caching.ICacheBlobPutResult.Success.get -> bool
 Imazen.Common.Storage.IBlobData
 Imazen.Common.Storage.IBlobData.Exists.get -> bool?
 Imazen.Common.Storage.IBlobData.LastModifiedDateUtc.get -> System.DateTime?
@@ -206,10 +165,9 @@ static Imazen.Common.Helpers.Signatures.SignRequest(string! pathAndQuery, string
 static Imazen.Common.Helpers.Signatures.SignString(string! data, string! key, int signatureLengthInBytes) -> string!
 static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, string! key, bool? value) -> void
 static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, string! key, long? value) -> void
-static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, string! key, string! value) -> void
+static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, string! key, string? value) -> void
 static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, string! key, System.Guid value) -> void
 static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.Add(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string!>>! items) -> void
 static Imazen.Common.Instrumentation.Support.InfoAccumulators.InfoAccumulatorExtensions.ToQueryString(this Imazen.Common.Instrumentation.Support.InfoAccumulators.IInfoAccumulator! a, int characterLimit) -> string!
-static Imazen.Common.Storage.Caching.CacheBlobPutOptions.Default.get -> Imazen.Common.Storage.Caching.CacheBlobPutOptions!
 virtual Imazen.Common.Issues.IssueSink.AcceptIssue(Imazen.Common.Issues.IIssue! i) -> void
 virtual Imazen.Common.Issues.IssueSink.GetIssues() -> System.Collections.Generic.IEnumerable<Imazen.Common.Issues.IIssue!>!
\ No newline at end of file