Bills would lift cap on charter schools, implement private school vouchers