Replace Thread.current with RequestStore.store