Merge "ART: Add field offset caching"