cache node correctly

closes #12951