Add JSON caching surface query engine