Modify cache mechanism to re-enable pagination