Tracking cache fix and clear