remove fragment of cache hack
sync with Context as of 2013-05-27
Merge pull request #92 from phi-gamma/master

sync