Basic cache fixes