Merge "Use CacheId when buffer is null." into tm-dev