diff --git a/bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java b/bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java
index 8debfaa7e..e473f321b 100644
--- a/bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java
+++ b/bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java
@@ -80,7 +80,7 @@ public class LuckPermsPlaceholderExpansion extends PlaceholderExpansion {
             return "";
         }
 
-        Optional<User> u = api.getUserSafe(player.getUniqueId());
+        Optional<User> u = api.getUserSafe(api.getUuidCache().getUUID(player.getUniqueId()));
         if (!u.isPresent()) {
             return "";
         }
diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java b/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java
index c5f776a4d..7e7a5d7b8 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java
@@ -33,6 +33,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.*;
 
+import java.util.UUID;
+
 class BukkitListener extends AbstractListener implements Listener {
     private final LPBukkitPlugin plugin;
 
@@ -80,20 +82,22 @@ class BukkitListener extends AbstractListener implements Listener {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
         // Refresh permissions again
-        plugin.getUserManager().getWorldCache().put(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
-        plugin.doAsync(() -> refreshPlayer(e.getPlayer().getUniqueId()));
+        UUID internal = plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId());
+        plugin.getUserManager().getWorldCache().put(internal, e.getPlayer().getWorld().getName());
+        plugin.doAsync(() -> refreshPlayer(internal));
     }
 
     @EventHandler
     public void onPlayerChangedWorld(PlayerChangedWorldEvent e) {
-        plugin.getUserManager().getWorldCache().put(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
-        plugin.doAsync(() -> refreshPlayer(e.getPlayer().getUniqueId()));
+        UUID internal = plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId());
+        plugin.getUserManager().getWorldCache().put(internal, e.getPlayer().getWorld().getName());
+        plugin.doAsync(() -> refreshPlayer(internal));
 
     }
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent e) {
-        plugin.getUserManager().getWorldCache().remove(e.getPlayer().getUniqueId());
+        plugin.getUserManager().getWorldCache().remove(plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId()));
         onLeave(e.getPlayer().getUniqueId());
     }
 
diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java b/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java
index ea56158a4..f2332f033 100644
--- a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java
+++ b/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java
@@ -55,7 +55,7 @@ public class BungeeListener extends AbstractListener implements Listener {
 
         final ProxiedPlayer player = ((ProxiedPlayer) e.getSender());
 
-        BungeePlayerCache playerCache = plugin.getPlayerCache().get(player.getUniqueId());
+        BungeePlayerCache playerCache = plugin.getPlayerCache().get(plugin.getUuidCache().getUUID(player.getUniqueId()));
         if (playerCache == null) {
             return;
         }
diff --git a/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java b/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java
index 397be9c36..fb22dc195 100644
--- a/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java
+++ b/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java
@@ -69,11 +69,11 @@ public class AbstractListener {
     protected void onLeave(UUID uuid) {
         final UuidCache cache = plugin.getUuidCache();
 
-        // Unload the user from memory when they disconnect;
-        cache.clearCache(uuid);
-
         final User user = plugin.getUserManager().get(cache.getUUID(uuid));
         plugin.getUserManager().unload(user);
+
+        // Unload the user from memory when they disconnect;
+        cache.clearCache(uuid);
     }
 
     protected void refreshPlayer(UUID uuid) {
diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java b/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
index 426621123..29e8c18c7 100644
--- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
+++ b/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
@@ -35,9 +35,7 @@ import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 import me.lucko.luckperms.groups.Group;
 import me.lucko.luckperms.users.User;
-import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.service.context.Context;
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.api.service.permission.SubjectCollection;
@@ -86,15 +84,6 @@ public class LuckPermsSubject implements Subject {
 
     @Override
     public Optional<CommandSource> getCommandSource() {
-        if (holder instanceof User) {
-            final UUID uuid = ((User) holder).getUuid();
-
-            Optional<Player> p = Sponge.getServer().getPlayer(uuid);
-            if (p.isPresent()) {
-                return Optional.of(p.get());
-            }
-        }
-
         return Optional.empty();
     }
 
diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java b/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java
index f3ad2054c..6976f1bb3 100644
--- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java
+++ b/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java
@@ -26,12 +26,13 @@ import com.google.common.base.Splitter;
 import lombok.Getter;
 import lombok.NonNull;
 import me.lucko.luckperms.users.User;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.service.context.Context;
 import org.spongepowered.api.util.Tristate;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class LuckPermsUserSubject extends LuckPermsSubject {
@@ -109,4 +110,21 @@ public class LuckPermsUserSubject extends LuckPermsSubject {
 
         return service.getDefaults().getPermissionValue(contexts, permission);
     }
+
+    @Override
+    public String getIdentifier() {
+        return service.getPlugin().getUuidCache().getExternalUUID(user.getUuid()).toString();
+    }
+
+    @Override
+    public Optional<CommandSource> getCommandSource() {
+        final UUID uuid = service.getPlugin().getUuidCache().getExternalUUID(user.getUuid());
+
+        Optional<Player> p = Sponge.getServer().getPlayer(uuid);
+        if (p.isPresent()) {
+            return Optional.of(p.get());
+        }
+
+        return Optional.empty();
+    }
 }
diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java b/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
index e599dc4a5..c4949f0c8 100644
--- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
+++ b/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
@@ -61,22 +61,23 @@ public class UserCollection implements SubjectCollection {
     }
 
     private void load(UUID uuid) {
-        if (!manager.isLoaded(uuid)) {
+        UUID internal = service.getPlugin().getUuidCache().getUUID(uuid);
+        if (!manager.isLoaded(internal)) {
             return;
         }
 
-        User user = manager.get(uuid);
-        users.put(uuid, LuckPermsUserSubject.wrapUser(user, service));
+        User user = manager.get(internal);
+        users.put(internal, LuckPermsUserSubject.wrapUser(user, service));
     }
 
     public void unload(UUID uuid) {
-        users.remove(uuid);
+        users.remove(service.getPlugin().getUuidCache().getUUID(uuid));
     }
 
     @Override
     public synchronized Subject get(@NonNull String id) {
         try {
-            UUID u = UUID.fromString(id);
+            UUID u = service.getPlugin().getUuidCache().getUUID(UUID.fromString(id));
             if (users.containsKey(u)) {
                 return users.get(u);
             }
@@ -105,7 +106,7 @@ public class UserCollection implements SubjectCollection {
     public boolean hasRegistered(@NonNull String id) {
         try {
             UUID u = UUID.fromString(id);
-            return manager.isLoaded(u);
+            return manager.isLoaded(service.getPlugin().getUuidCache().getUUID(u));
         } catch (IllegalArgumentException e) {
             User user = manager.get(id);
             return user != null;