Refactors spec due to random failure probably related to cache