Fixes for cache_type >> cache_mode references