Prior to this most recent change I had the entry iterator that operated on the current editor. It worked, but failed to pass the second test case below, but you also commented on that. Where that approach seems to fail is when you have a new key that's not in the cache.