adding test dependencies
merge issues
tweaking caching mechanism