Moved caching to separate file