Merge "BUG-997: fix InMemorySchemaSourceCache interface"