Fix objects being inserted into cache twice
Space -> tabs
Remove classes implemented in Bukkit API