Caching + Removed debugging code