More cache type modifications