Fix cache support