fixed dashboard caching with cache flush
merge