Update caching to handle find requests, and laying groundwork for inline rendering