Issue #142: simplified a method signature
Issue #142: using cached value before it expires