diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 588813d5f..d5e582e8c 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -256,7 +256,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         impromptuPipeline.registerService(offlinePlayerUUIDService);
         backgroundPipeline.registerService(offlinePlayerUUIDService);
 
-        final SQLiteUUIDService sqLiteUUIDService = new SQLiteUUIDService();
+        final SQLiteUUIDService sqLiteUUIDService = new SQLiteUUIDService("user_cache.db");
+        final SQLiteUUIDService legacyUUIDSerivce = new SQLiteUUIDService("usercache.db");
 
         final LuckPermsUUIDService luckPermsUUIDService;
         if (Bukkit.getPluginManager().getPlugin("LuckPerms") != null) {
@@ -288,6 +289,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             impromptuPipeline.registerConsumer(sqLiteUUIDService);
             backgroundPipeline.registerConsumer(sqLiteUUIDService);
 
+            impromptuPipeline.registerService(legacyUUIDSerivce);
+            backgroundPipeline.registerService(legacyUUIDSerivce);
+
             // Plugin providers
             if (luckPermsUUIDService != null) {
                 impromptuPipeline.registerService(luckPermsUUIDService);
@@ -307,6 +311,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             backgroundPipeline.registerService(sqLiteUUIDService);
             impromptuPipeline.registerConsumer(sqLiteUUIDService);
             backgroundPipeline.registerConsumer(sqLiteUUIDService);
+
+            impromptuPipeline.registerService(legacyUUIDSerivce);
+            backgroundPipeline.registerService(legacyUUIDSerivce);
         }
 
         impromptuPipeline.storeImmediately("*", DBFunc.EVERYONE);
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
index dc251bec4..16b3abff5 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
@@ -49,9 +49,9 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
 
     private final SQLite sqlite;
 
-    public SQLiteUUIDService() {
+    public SQLiteUUIDService(final String fileName) {
         this.sqlite =
-            new SQLite(MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "usercache.db"));
+            new SQLite(MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), fileName));
         try {
             this.sqlite.openConnection();
         } catch (ClassNotFoundException | SQLException e) {
@@ -59,7 +59,7 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
         }
 
         try (PreparedStatement stmt = getConnection().prepareStatement(
-            "CREATE TABLE IF NOT EXISTS `usercache` (uuid VARCHAR(32) NOT NULL, username VARCHAR(32) NOT NULL, PRIMARY KEY (uuid, username))")) {
+            "CREATE TABLE IF NOT EXISTS `usercache` (uuid VARCHAR(32) NOT NULL, username VARCHAR(32) NOT NULL, PRIMARY KEY (uuid))")) {
             stmt.execute();
         } catch (SQLException e) {
             e.printStackTrace();