Removed caching from make_square