Remove context caching. Pass tests.

Tests were failing due to enabling context caching which did;t work as
values were themselves cached.