remove changes from swapindex again, do the caching in the model class instead