diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
index 1bb8c657b..b0cd4b2c2 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
@@ -30,8 +30,8 @@ import static noppes.npcs.util.CustomNPCsThreader.playerDataThread;
 
 public class PlayerDataController {
 	public static PlayerDataController instance;
-	public static HashMap<String, String> nameUUIDs;
-	private static final CacheHashMap<String, CacheHashMap.CachedObject<PlayerData>> playerDataCache = new CacheHashMap<>(60 * 60 * 1000);
+	public HashMap<String, String> nameUUIDs;
+	private final CacheHashMap<String, CacheHashMap.CachedObject<PlayerData>> playerDataCache = new CacheHashMap<>(60 * 60 * 1000);
 
 	public PlayerDataController(){
 		instance = this;
@@ -249,13 +249,13 @@ public class PlayerDataController {
 		return new NBTTagCompound();
 	}
 
-	public static void putPlayerDataCache(final String uuid, final PlayerData playerCompound) {
+	public void putPlayerDataCache(final String uuid, final PlayerData playerCompound) {
 		synchronized (playerDataCache) {
 			playerDataCache.put(uuid, new CacheHashMap.CachedObject<>(playerCompound));
 		}
 	}
 
-	public static PlayerData getPlayerDataCache(final String uuid) {
+	public PlayerData getPlayerDataCache(final String uuid) {
 		synchronized (playerDataCache) {
 			if (!playerDataCache.containsKey(uuid)) {
 				return null;
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index 29e3546e3..31850ccee 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -220,7 +220,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 			filename = uuid + ".json";
 		}
 		PlayerDataController.instance.putPlayerMap(playername, uuid);
-		PlayerDataController.putPlayerDataCache(uuid, this);
+		PlayerDataController.instance.putPlayerDataCache(uuid, this);
 		CustomNPCsThreader.playerDataThread.execute(() -> {
 			try {
 				File saveDir = PlayerDataController.instance.getSaveDir();