EF AsNoTracking screws up state tracking on child objects when they are modified and then saved. Changed EF context back to singleton scope in all and removed the AsNoTracking calls for now. Will revisit.