Sounds ok, but one question.  Do we test no-key-change renames?  How detailed do we want that, e.g. or caching artifacts ok as long as eventually it gets right?  I know it has been broken in the past and I want to be precise on this part of the spec.