Only get store if it's needed

I'm trying to dig into #1243 and the inconsistency between belongsToWillChange and belongsToDidChange was irritating me. :)