Store found entities in a static variable for re-use. The entities will
never change so may as well make the most of less calls to the file
system. Also fixed a method call with missing param.