Modest speedups
Additional caching
Bugfix
Fix test failure
Revert slices=None fallback
Merge pull request #25 from ChrisBeaumont/refactor-wcs-handling

Speedups and a few bugfixes
Merge remote-tracking branch 'upstream/master'