Removed caches for now; implemented commands api completly