.optimize the import and make the query separate from the cache container