Try to use consistent UUIDs and not rely on Bukkit lookup while saving.