#master: fix in cache