Minor change to shapefile test
Caching improvements