i really dont want that caching...
Merge branch 'master' into stable