Fixes SPCoreDataStorage Race Condition

Fixes #395 

/cc @astralbodies Aaron, can i bother you with a review?.

Thank you sir!