Restructure cache