Ideally this would _replace_ the entry in the working set, not create a new entry at the end.