Cache folder -> Files folder, version fixes