Improve reuse of StoreClient