Ensure we are using the right binding provider throughout