Moved the mapping writes guard to the store itself