Moved caching back to localStorage