* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59': Properly identify how much metadata we need to cache in order to instantiate
* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59': Properly identify how much metadata we need to cache in order to instantiate