Cache: make mounts overwrite existing folders, prevents duplicate entries
Some style fixes