Correct issue with caching that caused problems with pagination