[WIP] (chore) Refactor the Redux caches for API data and Query for better handling of new features