Refactoring - TODO CounterCache doesn't decrement