Merge "Add back removed inline cache." into main