Revert "Fixed caching count issue"

This reverts commit 7d236b81d3367934d9e8da9761c896483618dfb6.