added legacy support for ToolbarActions
readded cache, fixed minor issues