Merge "Fix handling of array types when extracting the offline inline caches"