Includes fix to remove client cache