WIP: fix cache tests