Trivial changes and test for instance cache