Fix cache function and naming