Issue 655 cache issue