design improvements for new caches and new logs lists
Merge branch 'master' into next