Close GH-43: Make sure that cache is cleared in every case..