fixed cachingf
fixed cachingf