Fixes #5692 - correct counts in cached_counters
(cherry picked from commit ae4998bc96efd7c494f2d60313aca435cfc76b52)
Fixes #5692 - correct counts in cached_counters
(cherry picked from commit ae4998bc96efd7c494f2d60313aca435cfc76b52)