fix cardinality aggregator caching
Merge pull request #915 from metamx/backport-fix-cardinality-caching

fix cardinality aggregator caching