Updated caching to differenciate between list and full list.