EZP-23784: inject location handler directly to provider