Fix adaptation for new default reference cache strategy #5833