Add additional caching types.

[jcblw]

This will allow us to do things like responding to queries with cache if the cache is available and then update the cache after already responding.