Make sure to set aliases when caching is enabled.
Merge remote-tracking branch 'origin/develop' into feature/302-translations