Simplify proxy actor and fix possible race condition bug