Dev fix external identifiers cache issue