Trivial fixes after CR
Fixing internal caching + test