Better values list caching

Fixes #30