Corrected cache, clean up of resources.