Caching updates, getCountForId now checks for expired token as well