diff --git a/src/Balea.Api.Store/Extensions/HttpClientBuilderExtensions.cs b/src/Balea.Api.Store/Extensions/HttpClientBuilderExtensions.cs
deleted file mode 100644
index 479f2bc..0000000
--- a/src/Balea.Api.Store/Extensions/HttpClientBuilderExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Net.Http;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class HttpClientBuilderExtensions
-    {
-        public static IHttpClientBuilder AddIfHttpMessageHandler<THandler>(this IHttpClientBuilder builder, bool condition) where THandler : DelegatingHandler
-        {
-            return condition
-                ? builder.AddHttpMessageHandler<THandler>()
-                : builder;
-        }
-    }
-}
diff --git a/src/Balea.Api.Store/Extensions/HttpClientExtensions.cs b/src/Balea.Api.Store/Extensions/HttpClientExtensions.cs
index a28707b..a89e0f6 100644
--- a/src/Balea.Api.Store/Extensions/HttpClientExtensions.cs
+++ b/src/Balea.Api.Store/Extensions/HttpClientExtensions.cs
@@ -1,11 +1,12 @@
-using System.Text.Json;
+using System.Net.Http.Json;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace System.Net.Http
 {
     public static class HttpClientExtensions
     {
-        public static JsonSerializerOptions _serializationOptions = new JsonSerializerOptions()
+        public static readonly JsonSerializerOptions _serializationOptions = new JsonSerializerOptions()
         {
             AllowTrailingCommas = true,
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -20,8 +21,7 @@ public static class HttpClientExtensions
 
         public static async Task<TModel> GetJsonAsync<TModel>(this HttpClient client, string requestUri)
         {
-            string json = await client.GetStringAsync(requestUri);
-            return JsonSerializer.Deserialize<TModel>(json, _serializationOptions);
+            return await client.GetFromJsonAsync<TModel>(requestUri, _serializationOptions);
         }
     }
 }
diff --git a/src/Balea.Api.Store/Extensions/IDistributedCacheExtensions.cs b/src/Balea.Api.Store/Extensions/IDistributedCacheExtensions.cs
index c7667a3..b799b19 100644
--- a/src/Balea.Api.Store/Extensions/IDistributedCacheExtensions.cs
+++ b/src/Balea.Api.Store/Extensions/IDistributedCacheExtensions.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.Caching.Distributed
 {
     public static class DistributedCacheExtensions
     {
-        public static JsonSerializerOptions _serializationOptions = new JsonSerializerOptions()
+        public static readonly JsonSerializerOptions _serializationOptions = new JsonSerializerOptions()
         {
             AllowTrailingCommas = true,
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,