set proper cache timeouts
caching fixes
merge