Cache change propagator stable6

Backport of #8822 

cc @craigpg @PVince81