Merge "Revert "Remove cache dirs from the services""