Avoid unnecessary l3 plugin lookups

Change-Id: I09fcba95c818d280664b7211d288eb2cc5d952df