Merge "Revert "Revert "Fix a11y cache correctness bug"""