Updated project with cache support and report:wq