Merge "Remove the cache size from internal size." into qt-dev