HSEARCH-1448 Making sure that a potential proxy gets unproxied before accessed/returned