Issue #2202537 by alexpott: Avoid repeated cache tag invalidations.