Switch to actually-supported cache API