Fixes #6
Merge pull request #8 from NoUseFreak/context-cache

Fixes #6