Merge "Remove cache, and manually control archives lifecycle." into arc-apps