Use RequestStore in place of Thread.current