Move bordered texture caching into texture

Clean up non-bordered texture caching