I always put a resistor in parallel with the capacitor. Anything above 470 ohms or so does not significantly affect the diode, and will always ensure that the capacitor is drained very quickly. I also use a 47uf cap across my diodes. (Noticed it in your schematic) Using this resistor, you won't kill a diode by forgetting to discharge the capacitor when you change over from test load to real diode.