ENYO-3082: Remove data from cache *after* closing editor...

... i.e. don't pull the rug