Fix in memory client store