Bug fixes for the new cachehandling
Merge remote-tracking branch 'origin/develop'