Fix changes to block/word mapping in caches