Move discovery of proxy time earier in the process