Merge "Revert "Fix a11y cache correctness bug"" into pi-dev