change on caching method