New behaviour, cache class, command improvements, debugging improvements, fix bugs