Use @Modifying(...) to handle persistence context clearing/flushing

Use @Modifying(...) to handle persistence context clearing/flushing #1496