move cache to report-demo and out of client