Moved caching to caching