WIP: Fix cache