NMS-6030 fix cache/race condition in saving user data