Problem editing addressfields

I've got an addressfield connected with terms in a vocabulary and if I successively edit the address in different terms, the address in the first term that I edited comes up in the edit fields for the successive terms edited. I have confirmed that it is saving the edits properly, just not displaying existing addresses correctly when you edit terms one after another. Other fields in the term - user references and text fields, are behaving fine. I've got addressfield beta 4, but didn't see anything in the beta 5 release notes that seems related to this.