Merge "Fix loading from the cache for synchronous requests"