Added fix_in_caches