Move common constants to outer scope, state after int cache tests