Modify cache mechanism to re-enable pagination (Fix #3)