Merge "Remove trust level from cache when cm handles deleted"