Adding caching on the client and enable/disable vertices