enhanced the caching a little bit
merge master again