Fix for soft reload with cacheing turned on