Simplify DirectMappedNodeCache test
Merge remote-tracking branch 'simark/master'

Closes #3