Answered TODO, removed old caching.