Merge "Caching documentation tweaks and doxygen cleanups"