Various exemplary embodiments relate to a method of identifying a subscriber at a network node. The method may include: receiving a message including a network access identifier (NAI); removing the first digit from the NAI to form a stripped NAI; determining whether the stripped NAI corresponds to a subscriber; determining whether the NAI corresponds to a subscriber; adding a hint digit to form an extended NAI, and determining whether the extended NAI corresponds to a subscriber; and if any of the NAIs correspond to a subscriber, using the corresponding NAI to identify the subscriber. Various exemplary embodiments relate to a policy and charging rules node including: a subscriber cache including a subscriber identifier; an interface configured to receive a NAI; a NAI modifier configured to form an extended NAI and a stripped NAI; and a subscriber identification module configured to determine whether a NAI is stored in the subscriber cache.