-- Make lazy resolve thread-safe