Fetching and caching logic changed