Re-use instance of EntityIdParser in client factory

Change-Id: Ifa1fa3fab093f00e5b588558367674b33a8c8c9c