Minor changes
Fixed wrong instance passed to adapter and removed command cache