Fix #23625 - Remove CacheClass shim