Merge "Update LinkCache to use NamespaceInfo"