Merge "Use cached volumes to resolve volume paths"