Merge "[277422] Add caching to class hierarchy lookups"