fixes
fixes
changed caching approach