CoreData Caching Fixes

See commit log for more info.