Make thread safe (coupled with pymeta update dff8a0475c41dae72032935362be9f39ae9548c9)