The only poor workaround I've found so far is to set "Path tracing samples" in path tracing parameters to some crazy value like 2000 and be patient.
Also, I think setting HD cache to writeable for more than 0 passes makes caustics come out a bit faster.
