Remove adoptee caching