incr.comp.: Cache check_match and use ensure() for coherence-related queries.#46881