Trivial fixes after CR
Fixing internal caching + test
Revert "Fixing internal caching + test"

This reverts commit fc1b75c9af6139066f70ab950ab3892f5fd564d3.
Merge branch 'master' into slice-24
SLICE-24 applied code review comments
Merge branch 'slice-24'