Conflct detection changes

Also cache is now a instance property as opposed to a class property and error highlighting is back on fields in AccountEditor.