diff --git a/common-features/src/extensions/Modules/Authorization/BaseUserRetrieveService.cs b/common-features/src/extensions/Modules/Authorization/BaseUserRetrieveService.cs
index a9c3798fed..813106629c 100644
--- a/common-features/src/extensions/Modules/Authorization/BaseUserRetrieveService.cs
+++ b/common-features/src/extensions/Modules/Authorization/BaseUserRetrieveService.cs
@@ -24,7 +24,7 @@ public virtual IUserDefinition ByUsername(string username)
     protected abstract string GetCacheGroupKey();
 
     protected virtual string GetIdCacheKey(string id) => "UserByID_" + id;
-    protected virtual string GetUsernameCacheKey(string id) => "UserByName_" + id.ToLowerInvariant();
+    protected virtual string GetUsernameCacheKey(string username) => "UserByName_" + username.ToLowerInvariant();
 
     protected virtual IUserDefinition GetCachedById(string id)
     {
@@ -53,9 +53,9 @@ public virtual void RemoveAll()
     public virtual void RemoveCachedUser(string userId, string username)
     {
         if (IsValidUserId(userId))
-            cache.Remove("UserByID_" + userId);
+            cache.Remove(GetIdCacheKey(userId));
 
         if (IsValidUsername(username))
-            cache.Remove("UserByName_" + username.ToLowerInvariant());
+            cache.Remove(GetUsernameCacheKey(username));
     }
 }
\ No newline at end of file