Extend graph caching and test coverage.