Revert "Fixing typo."

This reverts commit 960d9f7df2560fc400295aa237b162f7a956a7e1.
Revert "Adding cache to speed up lookup queries."

This reverts commit c96d4dc897c8288abbd36c3ae5dabfc70419ce8c.