Fixing cache broken in previous refactoring. Cf JENKINS-24802