Merge "Revert "Use cached volumes to resolve volume paths""