[client][managed][offline] minor refactoring in the store