moved fix to cache too