fixed non-lazy initialization issue in Client\Factory