Unite: better caching