MODE-2123 Changed the code so that new nodes never try to find themselves in the workspace cache.

Also fixed some resulting regressions for specific situations.