Refactor AAAShiroProvider & Co. to be non static