diff --git a/Security/Common/Domain/Caching/OAuthUserExtension.cs b/Security/Common/Domain/Caching/OAuthUserExtension.cs
new file mode 100644
index 0000000..344663b
--- /dev/null
+++ b/Security/Common/Domain/Caching/OAuthUserExtension.cs
@@ -0,0 +1,9 @@
+namespace Mirea.Api.Security.Common.Domain.Caching;
+
+internal class OAuthUserExtension
+{
+    public string? Message { get; set; }
+    public bool IsSuccess { get; set; }
+    public required OAuthProvider? Provider { get; set; }
+    public OAuthUser? User { get; set; }
+}
\ No newline at end of file
diff --git a/Security/Services/OAuthService.cs b/Security/Services/OAuthService.cs
index cc0c3dc..506ce72 100644
--- a/Security/Services/OAuthService.cs
+++ b/Security/Services/OAuthService.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Domain.Caching;
 using Mirea.Api.Security.Common.Interfaces;
 using Mirea.Api.Security.Common.OAuth2;
 using Mirea.Api.Security.Common.OAuth2.UserInfo;
@@ -11,6 +12,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Security;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
@@ -166,7 +168,14 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         }
     }
 
-    public Uri GetProviderRedirect(HttpContext context, CookieOptionsParameters cookieOptions, string redirectUri,
+    private Task StoreOAuthUserInCache(string key, OAuthUserExtension data, CancellationToken cancellation) =>
+        cache.SetAsync(
+            key,
+            JsonSerializer.SerializeToUtf8Bytes(data),
+            slidingExpiration: TimeSpan.FromMinutes(15),
+            cancellationToken: cancellation);
+
+
     public Uri GetProviderRedirect(HttpContext context, CookieOptions cookieOptions, string redirectUri,
         OAuthProvider provider, Uri callback)
     {
@@ -205,17 +214,30 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         {
             Token = GeneratorKey.GenerateBase64(32)
         };
+
         var parts = state.Split('_');
 
         if (parts.Length != 2)
         {
             result.ErrorMessage = "The request data is invalid or malformed.";
+
+            await StoreOAuthUserInCache(result.Token, new OAuthUserExtension()
+            {
+                Message = result.ErrorMessage,
+                Provider = null
+            }, cancellation);
+
             return result;
         }
 
         var payload = DecryptPayload(parts[0]);
         var checksum = parts[1];
 
+        var cacheData = new OAuthUserExtension()
+        {
+            Provider = payload.Provider
+        };
+
         result.Callback = new Uri(payload.Callback);
 
         if (!providers.TryGetValue(payload.Provider, out var providerInfo) ||
@@ -226,6 +248,10 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 state);
 
             result.ErrorMessage = "Invalid authorization request. Please try again later.";
+            cacheData.Message = result.ErrorMessage;
+
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -233,6 +259,7 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         var checksumRequest = GetHmacString(requestInfo);
 
         result.ErrorMessage = "Authorization failed. Please try again later.";
+        cacheData.Message = result.ErrorMessage;
 
         if (checksumRequest != checksum)
         {
@@ -243,6 +270,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 checksum
             );
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -258,6 +287,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 payload.Provider,
                 checksum);
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -275,6 +306,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
             logger.LogWarning(ex, "Failed to retrieve user information from provider {Provider}",
                 payload.Provider);
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -284,12 +317,15 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         result.ErrorMessage = null;
         result.Success = true;
 
-        await cache.SetAsync(
-            result.Token,
-            JsonSerializer.SerializeToUtf8Bytes(user),
-            absoluteExpirationRelativeToNow: TimeSpan.FromMinutes(15),
-            cancellationToken: cancellation);
+        await StoreOAuthUserInCache(result.Token, new OAuthUserExtension
+        {
+            IsSuccess = true,
+            User = user,
+            Provider = payload.Provider
+        }, cancellation);
 
         return result;
     }
+
+
 }
\ No newline at end of file