Some cache fixes (still broken).