Merge "Stage backup/restore data in a cache subdir rather than root"