Can we put the logic for determining and caching the node name in here as well?