am 77f46bbe: Merge "Add DumpClass context on CacheField and CacheMethod failures"

* commit '77f46bbe03cde911bc4b36ff8e7807e8ceaa9f90':
  Add DumpClass context on CacheField and CacheMethod failures