Fix caching on context obj