diff --git a/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java b/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
index 99834d3a9ea..d520782d5c2 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
@@ -102,6 +102,13 @@ public User getUser(final UUID uuid) {
 
     @Override
     public User getUser(final Player base) {
+        final UUID uuid = base.getUniqueId();
+        final User cachedUser = userCache.getIfPresent(uuid);
+        if (cachedUser != null && cachedUser.getBase() == base) {
+            uuidCache.updateCache(uuid, base.getName());
+            return cachedUser;
+        }
+
         final User user = loadUncachedUser(base);
         userCache.put(user.getUUID(), user);
         debugLogCache(user);