Fix FORGE-2069: Fix cache for return type enhancement in CLAC