Fixes in cache clearing for units