Automatic merge from submit-queue (batch tested with PRs 47083, 44115, 46881, 47082, 46577)

Revert "Optimize selector for single-matching items"

This reverts commit f93a270e.

Fix: #46851

@smarterclayton 

The problem was that removing the requirement from the predicate resulted in not using "trigger" function in Cacher, which is super critical for performance. And this was messed up.