Added caching, changed structure of charts and started issue form