Fix caching
fix tests