[fix] add caching
[fixes]
[fix] add cache