Fix JDBC and LevelDB cachestore schema for 6.0