Issue #2365469: Convert to flat cache key set.
Issue #2365469: Ensure $cache_info properties are added.