Merge "Fix a11y cache correctness bug"