changes for fixing stale cache issue