Fixing the cache filename issue to be based on node name, not urn
Merge branch 'v0.1.7_candidate' into production