NCBO-971 added incremental cache to all counts
Merge branch 'staging'