Cache: try to improve global reliability of cache
Cache: remove current unit from completion list