Add cached_unit() to base datasource
Merge branch 'master' into lizard5-demo