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