cache node correctly

closes 12951
Merge pull request #12988 from gtmanfred/develop

cache node correctly