Remove use of (unsafe) static for dispacher