more caching for frequent queries
fix for #477