Upgrading `query` to have a caching system
Upgrading
queryto have a caching system