Merge "Add DumpClass context on CacheField and CacheMethod failures"