Fix cache setup