Replace caching implementation with fetched results controller