invalidate cache
improve previous commit
rename function