Removed some useless caches that waste memory