Add cache invalidation commands
Fix tests