Update to latest cache API