collectors: minor counter_cache logic tweaks