Merge "Remove cache dirs from the services"