Add Pagination and Caching