Caching store clients in AbstractStoreClientFactory
Minor fixes from conflicts