Fixixing cache issue