Reverted to singleton, errors with appscoped.