Include node id in the caching.

#9