Fix request context dependency

Fixes #140