Add counter cache #390