Bug Fix : Fixed cache issue.