Always save the entity even if it was not changed, this is necessary when metadata is updated. Also see
part of commit c791ca0915df417b57e3ad780474bb0e1a0cfbb4 (Don't reset 'modified' upon load because then updating of metadata fails)