PLX-467: [performance] simplify ThreadLocal solution