fix issue with Session caching