Deva Curl has this new serum called MirrorCurls.
It says its water-soluble, cone free.
http://www.devaconcepts.com/products/curl/MirrorCurls
I haven't tried it yet.