Merge "Change the resource cache key and limit the maximum size of cache" into main