Merge branch 'jc/the-index'

* jc/the-index:
Make read-cache.c "the_index" free.
Move index-related variables into a structure.

diff --cc cache.h
Simple merge