Previous refactor that shipped with 2.3 introduced regression for the experimental repository cache users. This restores the previous behavior (#3791).