Merge "Clean up JavaDoc for CacheManager"