diff --git a/Endpoint/Common/Services/Security/DistributedCacheService.cs b/Endpoint/Common/Services/Security/DistributedCacheService.cs
index 1d4a32b..3630ae0 100644
--- a/Endpoint/Common/Services/Security/DistributedCacheService.cs
+++ b/Endpoint/Common/Services/Security/DistributedCacheService.cs
@@ -17,12 +17,43 @@ public class DistributedCacheService(IDistributedCache cache) : ICacheService
             SlidingExpiration = slidingExpiration
         };
 
+        var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
+        if (type.IsPrimitive || type == typeof(string) || type == typeof(DateTime))
+        {
+            await cache.SetStringAsync(key, value?.ToString() ?? string.Empty, options, cancellationToken);
+            return;
+        }
+
         var serializedValue = value as byte[] ?? JsonSerializer.SerializeToUtf8Bytes(value);
         await cache.SetAsync(key, serializedValue, options, cancellationToken);
     }
 
     public async Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default)
     {
+        var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
+
+        if (type.IsPrimitive || type == typeof(string) || type == typeof(DateTime))
+        {
+            var primitiveValue = await cache.GetStringAsync(key, cancellationToken);
+
+            if (string.IsNullOrEmpty(primitiveValue))
+                return default;
+
+            if (type == typeof(string))
+                return (T?)(object?)primitiveValue;
+
+            var tryParseMethod = type.GetMethod("TryParse", [typeof(string), type.MakeByRefType()])
+                                 ?? throw new NotSupportedException($"Type {type.Name} does not support TryParse.");
+
+            var parameters = new[] { primitiveValue, Activator.CreateInstance(type) };
+            var success = (bool)tryParseMethod.Invoke(null, parameters)!;
+
+            if (success)
+                return (T)parameters[1]!;
+
+            return default;
+        }
+
         var cachedValue = await cache.GetAsync(key, cancellationToken);
         return cachedValue == null ? default : JsonSerializer.Deserialize<T>(cachedValue);
     }
diff --git a/Endpoint/Common/Services/Security/MemoryCacheService.cs b/Endpoint/Common/Services/Security/MemoryCacheService.cs
index 6c5b8f6..4c7f7fd 100644
--- a/Endpoint/Common/Services/Security/MemoryCacheService.cs
+++ b/Endpoint/Common/Services/Security/MemoryCacheService.cs
@@ -17,17 +17,41 @@ public class MemoryCacheService(IMemoryCache cache) : ICacheService
             SlidingExpiration = slidingExpiration
         };
 
+        var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
+        if (type.IsPrimitive || type == typeof(string) || type == typeof(DateTime))
+        {
+            cache.Set(key, value?.ToString() ?? string.Empty, options);
+            return Task.CompletedTask;
+        }
+
         cache.Set(key, value as byte[] ?? JsonSerializer.SerializeToUtf8Bytes(value), options);
         return Task.CompletedTask;
     }
 
     public Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default)
     {
-        return Task.FromResult(
-            cache.TryGetValue(key, out byte[]? value) ?
-            JsonSerializer.Deserialize<T>(value) :
-            default
-        );
+        var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
+
+        if (!type.IsPrimitive && type != typeof(string) && type != typeof(DateTime))
+            return Task.FromResult(
+                cache.TryGetValue(key, out byte[]? value) ? JsonSerializer.Deserialize<T>(value) : default
+            );
+
+        var primitiveValue = cache.Get(key);
+
+        if (string.IsNullOrEmpty(primitiveValue?.ToString()))
+            return Task.FromResult<T?>(default);
+
+        if (type == typeof(string))
+            return Task.FromResult((T?)primitiveValue);
+
+        var tryParseMethod = type.GetMethod("TryParse", [typeof(string), type.MakeByRefType()])
+                             ?? throw new NotSupportedException($"Type {type.Name} does not support TryParse.");
+
+        var parameters = new[] { primitiveValue, Activator.CreateInstance(type) };
+        var success = (bool)tryParseMethod.Invoke(null, parameters)!;
+
+        return success ? Task.FromResult((T?)parameters[1]) : Task.FromResult<T?>(default);
     }
 
     public Task RemoveAsync(string key, CancellationToken cancellationToken = default)