cachedWithin replaced with cacheForSeconds, and an internal query cache system