* Added context wrapping method to caching