repair scope-propagtion cache yet again
repair scope-propagtion cache yet again

Commit 352a5dd2d5 effectively reverted the repair
of d719c06e00.

Merge to v6.3

mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket