Revert change to SpatialIndexDefinition; fix deprecations in post-test cache cleanup