diff --git a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java
index 9089c80..39700e4 100644
--- a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java
+++ b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java
@@ -29,7 +29,6 @@ public class PlayerAttackListener implements Listener {
             Player victim = (Player) victimEntity;
 
             ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-
             SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
 
             if (Instant.now().getEpochSecond() < smartCache.getPlayerData(victim.getUniqueId()).getLoginTimestamp()) {
diff --git a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
index e0716a8..5a62edb 100644
--- a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
+++ b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
@@ -18,7 +18,8 @@ public class PlayerJoinAndLeaveListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        PlayerData playerData = TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
+        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
         playerData.setLoginTimestamp(Instant.now().getEpochSecond());
     }