Fixed #23625 - Removed CacheClass shim