Support preloads in resolved client entries (#11681)