Update caching service to handle new pagination features

Update caching service to handle new pagination features