Reverted a0a7a4b48d766517c0d1e096d2396f2b7f756259
Don't raise the default cache size, instead implement issue 4906