Storing Authentication Tokens clears the entire storage state and then repopulates causing extra storage events.

Storing Authentication Tokens clears the entire storage state and then repopulates causing extra storage events. #656