Cleanup
Increased caching