Added key and version to cash

Better subnet handling in testsuite