fix for a really awful / hard to find context caching bug.