FORGE-1954: Making it thread-safe