Darius: I don't like get/setFlushMode in the service. That doesn't improve things. Having a @ManualFlush method-level annotation would allow us to clean up the 7 instances of setFlushMode(MANUAL); try { ... } finally { reset } that are in openmrs-core (which is ugly code).