Add caching of key:value pairs for faster lookup