Add cached data and better API command.