Put back cache timeout (fix #933)