Index cache flush

Will squash when committing