Revert the secondary texture cache

Also fix two minor typo type issues.

-[Unknown]