Bring back usage of cached labels

Related #566