More work on new index/cache