Removed old caching mechanism