sync with Context as of 2013-06-10
fix input of cached resolver
Merge pull request #98 from phi-gamma/master

fix cached resolver