Improve caching, implement custom lists api