Improve caching
Fix pagination in cached items