fix issue regarding cache