Added count caching