Fix #717 cache issue