Merge "[2/n] Add cache to width/height thin definition" into 24D1-dev