Fix TestHelper caching method for tmpId-Id mappings.