Refs #9558 - Cache edited annotations for a better user experience