Merge pull request #1 from md-systems/8.x

Update for D8 changes
Fixes comment typo
Merge pull request #2 from md-systems/8.x

Add current object always to the graph
Use cache.default, TargetIdResolver is in core now.