correct the fix for #20637; allow slot descriptor inheritance to take place before creating cached keys
2 files changed