Reverted back the InMemoryDescriptorCache to nail down a problem.